| Index: Source/web/WebKit.cpp
|
| diff --git a/Source/web/WebKit.cpp b/Source/web/WebKit.cpp
|
| index a4030af9636a609ada2b3bf5c3872633b2a6f492..22c7201776b142d3118e121458e6f78cc1c15f40 100644
|
| --- a/Source/web/WebKit.cpp
|
| +++ b/Source/web/WebKit.cpp
|
| @@ -50,9 +50,9 @@
|
| #include "platform/heap/Heap.h"
|
| #include "platform/heap/glue/MessageLoopInterruptor.h"
|
| #include "platform/heap/glue/PendingGCRunner.h"
|
| -#include "platform/scheduler/Scheduler.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebPrerenderingSupport.h"
|
| +#include "public/platform/WebScheduler.h"
|
| #include "public/platform/WebThread.h"
|
| #include "web/IndexedDBClientImpl.h"
|
| #include "web/WebMediaPlayerClientImpl.h"
|
| @@ -133,7 +133,7 @@ static void cryptographicallyRandomValues(unsigned char* buffer, size_t length)
|
|
|
| static void callOnMainThreadFunction(WTF::MainThreadFunction function, void* context)
|
| {
|
| - Scheduler::shared()->postTask(FROM_HERE, bind(function, context));
|
| + Platform::current()->callOnMainThread(function, context);
|
| }
|
|
|
| void initializeWithoutV8(Platform* platform)
|
| @@ -148,7 +148,6 @@ void initializeWithoutV8(Platform* platform)
|
| WTF::initialize(currentTimeFunction, monotonicallyIncreasingTimeFunction);
|
| WTF::initializeMainThread(callOnMainThreadFunction);
|
| Heap::init();
|
| - Scheduler::initializeOnMainThread();
|
|
|
| ThreadState::attachMainThread();
|
| // currentThread will always be non-null in production, but can be null in Chromium unit tests.
|
| @@ -221,7 +220,8 @@ void shutdownWithoutV8()
|
| {
|
| ASSERT(!s_endOfTaskRunner);
|
| CoreInitializer::shutdown();
|
| - Scheduler::shutdown();
|
| + if (WebScheduler* scheduler = Platform::current()->scheduler())
|
| + scheduler->shutdown();
|
| Heap::shutdown();
|
| WTF::shutdown();
|
| Platform::shutdown();
|
|
|