| Index: third_party/WebKit/Source/web/WebKit.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebKit.cpp b/third_party/WebKit/Source/web/WebKit.cpp
|
| index 1051c2379c90b7e4db63a57db75c21a4791d7918..e0d77b0100949369b997707216fac4482758cb75 100644
|
| --- a/third_party/WebKit/Source/web/WebKit.cpp
|
| +++ b/third_party/WebKit/Source/web/WebKit.cpp
|
| @@ -80,16 +80,16 @@ static ModulesInitializer& modulesInitializer()
|
| return *initializer;
|
| }
|
|
|
| -void initialize(Platform* platform)
|
| +void initialize()
|
| {
|
| - Platform::initialize(platform);
|
| + DCHECK(Platform::current());
|
|
|
| V8Initializer::initializeMainThread();
|
|
|
| modulesInitializer().initialize();
|
|
|
| // currentThread is null if we are running on a thread without a message loop.
|
| - if (WebThread* currentThread = platform->currentThread()) {
|
| + if (WebThread* currentThread = Platform::current()->currentThread()) {
|
| DCHECK(!s_endOfTaskRunner);
|
| s_endOfTaskRunner = new EndOfTaskRunner;
|
| currentThread->addTaskObserver(s_endOfTaskRunner);
|
| @@ -112,8 +112,6 @@ void shutdown()
|
| modulesInitializer().shutdown();
|
|
|
| V8Initializer::shutdownMainThread();
|
| -
|
| - Platform::shutdown();
|
| }
|
|
|
| v8::Isolate* mainThreadIsolate()
|
|
|