Changeset 93654 in webkit

Timestamp:

Aug 23, 2011 4:22:19 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=66751
[Chromium]WebWorkerClientImpl should always invoke
InspectorIntrumentation on main thread.
The fix moves calls to InspectorInstrumentation from
WebWorkerClientImpl to unedrlying WorkerMessagingProxy.

Patch by Dmitry Lomov <Dmitry Lomov (​dslomov@google.com)> on 2011-08-23
Reviewed by Pavel Feldman.

Source/WebCore:

Covered by existing tests.

• inspector/InstrumentingAgents.cpp:

(WebCore::instrumentationForPage):

• workers/WorkerMessagingProxy.cpp:

(WebCore::WorkerMessagingProxy::workerContextDestroyedInternal):
(WebCore::WorkerMessagingProxy::terminateWorkerContext):

Source/WebKit/chromium:

• src/WebWorkerClientImpl.cpp:

(WebKit::WebWorkerClientImpl::terminateWorkerContext):
(WebKit::WebWorkerClientImpl::workerContextDestroyed):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InstrumentingAgents.cpp (modified) (1 diff)
• WebCore/workers/WorkerMessagingProxy.cpp (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebWorkerClientImpl.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-23  Dmitry Lomov  <Dmitry Lomov (dslomov@google.com)>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66751 
+        [Chromium]WebWorkerClientImpl should always invoke
+        InspectorIntrumentation on main thread.
+        The fix moves calls to InspectorInstrumentation from
+        WebWorkerClientImpl to unedrlying WorkerMessagingProxy.
+
+        Reviewed by Pavel Feldman.
+
+        Covered by existing tests.
+
+        * inspector/InstrumentingAgents.cpp:
+        (WebCore::instrumentationForPage):
+        * workers/WorkerMessagingProxy.cpp:
+        (WebCore::WorkerMessagingProxy::workerContextDestroyedInternal):
+        (WebCore::WorkerMessagingProxy::terminateWorkerContext):
+
 2011-08-23  Misha Tyutyunik  <michael.tyutyunik@nokia.com>
 

trunk/Source/WebCore/inspector/InstrumentingAgents.cpp

@@ -43 +43 @@
 InstrumentingAgents* instrumentationForPage(Page* page)
 {
+    ASSERT(isMainThread());
     if (InspectorController* controller = page->inspectorController())
         return controller->m_instrumentingAgents.get();

trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp

@@ -39 +39 @@
 #include "ErrorEvent.h"
 #include "ExceptionCode.h"
+#include "InspectorInstrumentation.h"
 #include "MessageEvent.h"
 #include "ScriptCallStack.h"
@@ -341 +342 @@
     m_askedToTerminate = true;
     m_workerThread = 0;
+
+    InspectorInstrumentation::workerContextTerminated(m_scriptExecutionContext.get(), this);
+
     if (!m_workerObject)
         delete this;
@@ -353 +357 @@
     if (m_workerThread)
         m_workerThread->stop();
+
+    InspectorInstrumentation::workerContextTerminated(m_scriptExecutionContext.get(), this);
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-23  Dmitry Lomov  <Dmitry Lomov (dslomov@google.com)>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66751 
+        [Chromium]WebWorkerClientImpl should always invoke
+        InspectorIntrumentation on main thread.
+        The fix moves calls to InspectorInstrumentation from
+        WebWorkerClientImpl to unedrlying WorkerMessagingProxy.
+
+        Reviewed by Pavel Feldman.
+
+        * src/WebWorkerClientImpl.cpp:
+        (WebKit::WebWorkerClientImpl::terminateWorkerContext):
+        (WebKit::WebWorkerClientImpl::workerContextDestroyed):
+
 2011-08-23  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

@@ -40 +40 @@
 #include "Frame.h"
 #include "FrameLoaderClient.h"
-#include "InspectorInstrumentation.h"
 #include "MessageEvent.h"
 #include "MessagePort.h"
@@ -97 +96 @@
 {
     m_proxy->terminateWorkerContext();
-    InspectorInstrumentation::workerContextTerminated(m_scriptExecutionContext.get(), this);
 }
 
@@ -186 +184 @@
 {
     m_proxy->workerContextDestroyed();
-    InspectorInstrumentation::workerContextTerminated(m_scriptExecutionContext.get(), this);
 }