Changeset 101418 in webkit

Timestamp:

Nov 29, 2011 1:33:55 PM (12 years ago)

Author:

adamk@chromium.org

Message:

[chromium] WebKitMutationObserver::deliverAllMutations should be exposed through the Chromium API
​https://bugs.webkit.org/show_bug.cgi?id=71242

Reviewed by Darin Fisher.

Add addTaskObserver and removeTaskObserver to WebThread,
along with a new WebThread::TaskObserver interface.

For mutation observers, add a TaskObserver to the main thread
to deliver mutations after each task runs.

The Chromium side of this patch is ​http://codereview.chromium.org/8586038/

• public/platform/WebThread.h:

(WebKit::WebThread::TaskObserver::~TaskObserver):

• src/WebKit.cpp:

(WebKit::initialize):
(WebKit::shutdown):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/platform/WebThread.h (modified) (1 diff)
• src/WebKit.cpp (modified) (4 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-28  Adam Klein  <adamk@chromium.org>
+
+        [chromium] WebKitMutationObserver::deliverAllMutations should be exposed through the Chromium API
+        https://bugs.webkit.org/show_bug.cgi?id=71242
+
+        Reviewed by Darin Fisher.
+
+        Add addTaskObserver and removeTaskObserver to WebThread,
+        along with a new WebThread::TaskObserver interface.
+
+        For mutation observers, add a TaskObserver to the main thread
+        to deliver mutations after each task runs.
+
+        The Chromium side of this patch is http://codereview.chromium.org/8586038/
+
+        * public/platform/WebThread.h:
+        (WebKit::WebThread::TaskObserver::~TaskObserver):
+        * src/WebKit.cpp:
+        (WebKit::initialize):
+        (WebKit::shutdown):
+
 2011-11-29  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebKit/chromium/public/platform/WebThread.h

@@ -44 +44 @@
     };
 
+    class TaskObserver {
+    public:
+        virtual ~TaskObserver() { }
+        virtual void didProcessTask() = 0;
+    };
+
     virtual void postTask(Task*) = 0;
     virtual void postDelayedTask(Task*, long long delayMs) = 0;
+    virtual void addTaskObserver(TaskObserver*) { }
+    virtual void removeTaskObserver(TaskObserver*) { }
 
     virtual ~WebThread() { }

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

@@ -40 +40 @@
 #include "TextEncoding.h"
 #include "V8Binding.h"
+#include "WebKitMutationObserver.h"
 #include "WebKitPlatformSupport.h"
 #include "WebMediaPlayerClientImpl.h"
 #include "WebSocket.h"
+#include "WebThread.h"
 #include "WorkerContextExecutionProxy.h"
 #include "v8.h"
@@ -52 +54 @@
 
 namespace WebKit {
+
+#if ENABLE(MUTATION_OBSERVERS)
+namespace {
+
+class EndOfTaskRunner : public WebThread::TaskObserver {
+public:
+    virtual void didProcessTask()
+    {
+        WebCore::WebKitMutationObserver::deliverAllMutations();
+    }
+};
+
+} // namespace
+
+static WebThread::TaskObserver* s_endOfTaskRunner = 0;
+#endif // ENABLE(MUTATION_OBSERVERS)
 
 // Make sure we are not re-initialized in the same address space.
@@ -76 +94 @@
     v8::V8::Initialize();
     WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
+
+#if ENABLE(MUTATION_OBSERVERS)
+    ASSERT(!s_endOfTaskRunner);
+    s_endOfTaskRunner = new EndOfTaskRunner;
+    webKitPlatformSupport->currentThread()->addTaskObserver(s_endOfTaskRunner);
+#endif
 }
 
@@ -108 +132 @@
     delete WebCore::CCProxy::mainThread();
     WebCore::CCProxy::setMainThread(0);
+#if ENABLE(MUTATION_OBSERVERS)
+    if (s_endOfTaskRunner) {
+        s_webKitPlatformSupport->currentThread()->removeTaskObserver(s_endOfTaskRunner);
+        delete s_endOfTaskRunner;
+        s_endOfTaskRunner = 0;
+    }
+#endif
     s_webKitPlatformSupport = 0;
 }