| 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 c0b0857acf983b17be15c8d7c31e1a3abf7af76f..a3a8e8b7a36c8e2d13748c1821ea9a9f3c739ee7 100644
|
| --- a/third_party/WebKit/Source/web/WebKit.cpp
|
| +++ b/third_party/WebKit/Source/web/WebKit.cpp
|
| @@ -34,11 +34,10 @@
|
| #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/page/Page.h"
|
| #include "gin/public/v8_platform.h"
|
| -#include "modules/InitModules.h"
|
| +#include "modules/ModulesInitializer.h"
|
| #include "platform/LayoutTestSupport.h"
|
| #include "platform/Logging.h"
|
| #include "platform/heap/Heap.h"
|
| @@ -85,7 +84,7 @@ void initialize(Platform* platform)
|
| {
|
| Platform::initialize(platform);
|
|
|
| - modulesInitializer().init();
|
| + modulesInitializer().initialize();
|
| setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
|
|
|
| V8Initializer::initializeMainThread();
|
| @@ -98,11 +97,6 @@ void initialize(Platform* platform)
|
| }
|
| }
|
|
|
| -v8::Isolate* mainThreadIsolate()
|
| -{
|
| - return V8PerIsolateData::mainThreadIsolate();
|
| -}
|
| -
|
| void shutdown()
|
| {
|
| ThreadState::current()->cleanupMainThread();
|
| @@ -123,6 +117,11 @@ void shutdown()
|
| Platform::shutdown();
|
| }
|
|
|
| +v8::Isolate* mainThreadIsolate()
|
| +{
|
| + return V8PerIsolateData::mainThreadIsolate();
|
| +}
|
| +
|
| // TODO(tkent): The following functions to wrap LayoutTestSupport should be
|
| // moved to public/platform/.
|
|
|
|
|