Reland 171036i "Hook up gin platform to blink, and explicitly manage the main ..."

Source/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 24 matching lines @@
 #include "RuntimeEnabledFeatures.h"
 #include "WebMediaPlayerClientImpl.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8Initializer.h"
 #include "bindings/v8/V8RecursionScope.h"
 #include "core/Init.h"
 #include "core/dom/Microtask.h"
 #include "core/page/Page.h"
 #include "core/frame/Settings.h"
 #include "core/workers/WorkerGlobalScopeProxy.h"
+#include "gin/public/v8_platform.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/Logging.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/WebPrerenderingSupport.h"
 #include "public/platform/WebThread.h"
@@ skipping 42 matching lines @@
 static void assertV8RecursionScope()
 {
     ASSERT(!isMainThread() || WebCore::V8RecursionScope::properlyUsed(v8::Isolate::GetCurrent()));
 }
 #endif
 
 void initialize(Platform* platform)
 {
     initializeWithoutV8(platform);
 
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::V8::InitializePlatform(gin::V8Platform::Get());
+    v8::Isolate* isolate = v8::Isolate::New();
+    isolate->Enter();
     WebCore::V8Initializer::initializeMainThreadIfNeeded(isolate);
     v8::V8::SetEntropySource(&generateEntropy);
     v8::V8::SetArrayBufferAllocator(WebCore::v8ArrayBufferAllocator());
     v8::V8::Initialize();
     WebCore::V8PerIsolateData::ensureInitialized(isolate);
 
     s_isolateInterruptor = new WebCore::V8IsolateInterruptor(v8::Isolate::GetCurrent());
     WebCore::ThreadState::current()->addInterruptor(s_isolateInterruptor);
 
     // currentThread will always be non-null in production, but can be null in Chromium unit tests.
@@ skipping 98 matching lines @@
         ASSERT(s_messageLoopInterruptor);
         WebCore::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.
     WebCore::ThreadState::detachMainThread();
 
-    WebCore::V8PerIsolateData::dispose(WebCore::V8PerIsolateData::mainThreadIsolate());
-    v8::V8::Dispose();
+    v8::Isolate* isolate = WebCore::V8PerIsolateData::mainThreadIsolate();
+    WebCore::V8PerIsolateData::dispose(isolate);
+    isolate->Exit();
+    isolate->Dispose();
 
     shutdownWithoutV8();
 }
 
 void shutdownWithoutV8()
 {
     ASSERT(!s_endOfTaskRunner);
     WebCore::ImageDecodingStore::shutdown();
     WebCore::shutdown();
     WebCore::Heap::shutdown();
@@ skipping 30 matching lines @@
         channel->state = WTFLogChannelOn;
 #endif // !LOG_DISABLED
 }
 
 void resetPluginCache(bool reloadPages)
 {
     WebCore::Page::refreshPlugins(reloadPages);
 }
 
 } // namespace blink