Remove the last WebThread task observer

sky/engine/web/WebKit.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "public/web/WebKit.h"
 
+#include "base/message_loop/message_loop.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8Initializer.h"
 #include "core/Init.h"
 #include "core/animation/AnimationClock.h"
 #include "core/dom/Microtask.h"
 #include "core/frame/Settings.h"
 #include "core/page/Page.h"
 #include "gin/public/v8_platform.h"
+#include "mojo/common/message_pump_mojo.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/ImageDecodingStore.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "platform/heap/Heap.h"
 #include "platform/heap/glue/MessageLoopInterruptor.h"
-#include "platform/heap/glue/PendingGCRunner.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebThread.h"
 #include "web/WebMediaPlayerClientImpl.h"
 #include "wtf/Assertions.h"
 #include "wtf/CryptographicallyRandomNumber.h"
 #include "wtf/MainThread.h"
 #include "wtf/WTF.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/TextEncoding.h"
 #include <v8.h>
 
 namespace blink {
 
 namespace {
 
-class EndOfTaskRunner : public WebThread::TaskObserver {
+void willProcessTask()
+{
+    AnimationClock::notifyTaskStart();
+}
+
+void didProcessTask()
+{
+    Microtask::performCheckpoint();
+    V8GCController::reportDOMMemoryUsageToV8(mainThreadIsolate());
+}
+
+class TaskObserver : public base::MessageLoop::TaskObserver {
 public:
-    virtual void willProcessTask() OVERRIDE
-    {
-        AnimationClock::notifyTaskStart();
-    }
-    virtual void didProcessTask() OVERRIDE
-    {
-        Microtask::performCheckpoint();
-        V8GCController::reportDOMMemoryUsageToV8(mainThreadIsolate());
-    }
+    void WillProcessTask(const base::PendingTask& pending_task) override { willProcessTask(); }
+    void DidProcessTask(const base::PendingTask& pending_task) override { didProcessTask(); }
 };
 
+class SignalObserver : public mojo::common::MessagePumpMojo::Observer {
+public:
+    void WillSignalHandler() override { willProcessTask(); }
+    void DidSignalHandler() override { didProcessTask(); }
+};
+
+static TaskObserver* s_taskObserver = 0;
+static SignalObserver* s_signalObserver = 0;
+
+void addMessageLoopObservers()
+{
+    ASSERT(!s_taskObserver);
+    s_taskObserver = new TaskObserver;
+
+    ASSERT(!s_signalObserver);
+    s_signalObserver = new SignalObserver;
+
+    base::MessageLoop::current()->AddTaskObserver(s_taskObserver);
+    mojo::common::MessagePumpMojo::current()->AddObserver(s_signalObserver);
+}
+
+void removeMessageLoopObservers()
+{
+    base::MessageLoop::current()->RemoveTaskObserver(s_taskObserver);
+    mojo::common::MessagePumpMojo::current()->RemoveObserver(s_signalObserver);
+
+    ASSERT(s_taskObserver);
+    delete s_taskObserver;
+    s_taskObserver = 0;
+
+    ASSERT(s_signalObserver);
+    delete s_signalObserver;
+    s_signalObserver = 0;
+}
+
 } // namespace
 
-static WebThread::TaskObserver* s_endOfTaskRunner = 0;
-static WebThread::TaskObserver* s_pendingGCRunner = 0;
-static ThreadState::Interruptor* s_messageLoopInterruptor = 0;
 static ThreadState::Interruptor* s_isolateInterruptor = 0;
 
 // Make sure we are not re-initialized in the same address space.
 // Doing so may cause hard to reproduce crashes.
 static bool s_webKitInitialized = false;
 
 void initialize(Platform* platform)
 {
     initializeWithoutV8(platform);
 
     V8Initializer::initializeMainThreadIfNeeded();
 
     s_isolateInterruptor = new V8IsolateInterruptor(V8PerIsolateData::mainThreadIsolate());
     ThreadState::current()->addInterruptor(s_isolateInterruptor);
 
-    // currentThread will always be non-null in production, but can be null in Chromium unit tests.
-    if (WebThread* currentThread = platform->currentThread()) {
-        ASSERT(!s_endOfTaskRunner);
-        s_endOfTaskRunner = new EndOfTaskRunner;
-        currentThread->addTaskObserver(s_endOfTaskRunner);
-    }
+    addMessageLoopObservers();
 }
 
 v8::Isolate* mainThreadIsolate()
 {
     return V8PerIsolateData::mainThreadIsolate();
 }
 
 static double currentTimeFunction()
 {
     return Platform::current()->currentTime();
@@ skipping 21 matching lines @@
 
     ASSERT(platform);
     Platform::initialize(platform);
 
     WTF::setRandomSource(cryptographicallyRandomValues);
     WTF::initialize(currentTimeFunction, monotonicallyIncreasingTimeFunction);
     WTF::initializeMainThread(callOnMainThreadFunction);
     Heap::init();
 
     ThreadState::attachMainThread();
-    // currentThread will always be non-null in production, but can be null in Chromium unit tests.
-    if (WebThread* currentThread = platform->currentThread()) {
-        ASSERT(!s_pendingGCRunner);
-        s_pendingGCRunner = new PendingGCRunner;
-        currentThread->addTaskObserver(s_pendingGCRunner);
-
-        ASSERT(!s_messageLoopInterruptor);
-        s_messageLoopInterruptor = new MessageLoopInterruptor(currentThread);
-        ThreadState::current()->addInterruptor(s_messageLoopInterruptor);
-    }
 
     DEFINE_STATIC_LOCAL(CoreInitializer, initializer, ());
     initializer.init();
 
     // There are some code paths (for example, running WebKit in the browser
     // process and calling into LocalStorage before anything else) where the
     // UTF8 string encoding tables are used on a background thread before
     // they're set up.  This is a problem because their set up routines assert
     // they're running on the main WebKitThread.  It might be possible to make
     // the initialization thread-safe, but given that so many code paths use
     // this, initializing this lazily probably doesn't buy us much.
     WTF::UTF8Encoding();
 
     MediaPlayer::setMediaEngineCreateFunction(WebMediaPlayerClientImpl::create);
 }
 
 void shutdown()
 {
-    // currentThread will always be non-null in production, but can be null in Chromium unit tests.
-    if (Platform::current()->currentThread()) {
-        ASSERT(s_endOfTaskRunner);
-        Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskRunner);
-        delete s_endOfTaskRunner;
-        s_endOfTaskRunner = 0;
-    }
+    removeMessageLoopObservers();
 
     ASSERT(s_isolateInterruptor);
     ThreadState::current()->removeInterruptor(s_isolateInterruptor);
 
-    // currentThread will always be non-null in production, but can be null in Chromium unit tests.
-    if (Platform::current()->currentThread()) {
-        ASSERT(s_pendingGCRunner);
-        delete s_pendingGCRunner;
-        s_pendingGCRunner = 0;
-
-        ASSERT(s_messageLoopInterruptor);
-        ThreadState::current()->removeInterruptor(s_messageLoopInterruptor);
-        delete s_messageLoopInterruptor;
-        s_messageLoopInterruptor = 0;
-    }
-
     // Detach the main thread before starting the shutdown sequence
     // so that the main thread won't get involved in a GC during the shutdown.
     ThreadState::detachMainThread();
 
     v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
     V8PerIsolateData::dispose(isolate);
 
     shutdownWithoutV8();
 }
 
 void shutdownWithoutV8()
 {
-    ASSERT(!s_endOfTaskRunner);
     CoreInitializer::shutdown();
     Heap::shutdown();
     WTF::shutdown();
     Platform::shutdown();
 }
 
 void setLayoutTestMode(bool value)
 {
     LayoutTestSupport::setIsRunningLayoutTest(value);
 }
@@ skipping 16 matching lines @@
 void enableLogChannel(const char* name)
 {
 #if !LOG_DISABLED
     WTFLogChannel* channel = getChannelFromName(name);
     if (channel)
         channel->state = WTFLogChannelOn;
 #endif // !LOG_DISABLED
 }
 
 } // namespace blink