2009-02-27 Jian Li <jianli@chromium.org>

        Reviewed by Alexey Proskuryakov.

        Add confirmMessageFromWorkerObject to WorkerObjectProxy.
        https://bugs.webkit.org/show_bug.cgi?id=24152

        * workers/WorkerMessagingProxy.cpp:
        (WebCore::MessageWorkerContextTask::performTask):
        (WebCore::WorkerMessagingProxy::confirmMessageFromWorkerObject):
        * workers/WorkerMessagingProxy.h:
        * workers/WorkerObjectProxy.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9c59011..ad1603d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-02-27  Jian Li  <jianli@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add confirmMessageFromWorkerObject to WorkerObjectProxy.
+        https://bugs.webkit.org/show_bug.cgi?id=24152
+
+        * workers/WorkerMessagingProxy.cpp:
+        (WebCore::MessageWorkerContextTask::performTask):
+        (WebCore::WorkerMessagingProxy::confirmMessageFromWorkerObject):
+        * workers/WorkerMessagingProxy.h:
+        * workers/WorkerObjectProxy.h:
+
 2009-02-27  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by David Hyatt.

diff --git a/WebCore/workers/WorkerMessagingProxy.cpp b/WebCore/workers/WorkerMessagingProxy.cpp
index 24c82fa..4b34658 100644 (file)
--- a/WebCore/workers/WorkerMessagingProxy.cpp
+++ b/WebCore/workers/WorkerMessagingProxy.cpp
@@ -62,7 +62,7 @@ private:
 
         context->dispatchMessage(m_message);
 
-        static_cast<WorkerMessagingProxy*>(context->thread()->workerObjectProxy())->confirmWorkerThreadMessage(context->hasPendingActivity());
+        context->thread()->workerObjectProxy()->confirmMessageFromWorkerObject(context->hasPendingActivity());
     }
 
 private:
@@ -311,7 +311,7 @@ void WorkerMessagingProxy::terminateWorkerContext()
         m_workerThread->stop();
 }
 
-void WorkerMessagingProxy::confirmWorkerThreadMessage(bool hasPendingActivity)
+void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
 {
     m_scriptExecutionContext->postTask(WorkerThreadActivityReportTask::create(this, true, hasPendingActivity));
     // Will execute reportPendingActivityInternal() on context's thread.

diff --git a/WebCore/workers/WorkerMessagingProxy.h b/WebCore/workers/WorkerMessagingProxy.h
index 3c85876..8d81deb 100644 (file)
--- a/WebCore/workers/WorkerMessagingProxy.h
+++ b/WebCore/workers/WorkerMessagingProxy.h
@@ -61,6 +61,7 @@ namespace WebCore {
         virtual void postMessageToWorkerObject(const String& message);
         virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL);
         virtual void postConsoleMessageToWorkerObject(MessageDestination, MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL);
+        virtual void confirmMessageFromWorkerObject(bool hasPendingActivity);
         virtual void reportPendingActivity(bool hasPendingActivity);
         virtual void workerContextDestroyed();
 
@@ -70,8 +71,6 @@ namespace WebCore {
 
         void workerThreadCreated(PassRefPtr<WorkerThread>);
 
-        void confirmWorkerThreadMessage(bool hasPendingActivity);
-
         // Only use this method on the worker object thread.
         bool askedToTerminate() const { return m_askedToTerminate; }
 

diff --git a/WebCore/workers/WorkerObjectProxy.h b/WebCore/workers/WorkerObjectProxy.h
index 61aba73..3b86028 100644 (file)
--- a/WebCore/workers/WorkerObjectProxy.h
+++ b/WebCore/workers/WorkerObjectProxy.h
@@ -50,6 +50,8 @@ namespace WebCore {
 
         virtual void postConsoleMessageToWorkerObject(MessageDestination, MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL) = 0;
 
+        virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) = 0;
+
         virtual void reportPendingActivity(bool hasPendingActivity) = 0;
 
         virtual void workerContextDestroyed() = 0;