Store ScriptWrappableVisitor in V8PerIsolateData

third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp

Index: third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
index f2c049db85f3b606f91f425b876d1cb1ad19f2a5..8fe62e43c0323c1d7f599029e2f2416dad74d37a 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
@@ -291,6 +291,7 @@ static void initializeV8Common(v8::Isolate* isolate)
     isolate->AddGCEpilogueCallback(V8GCController::gcEpilogue);
     if (RuntimeEnabledFeatures::traceWrappablesEnabled()) {
         ScriptWrappableVisitor* visitor = new ScriptWrappableVisitor(isolate);
+        V8PerIsolateData::from(isolate)->setScriptWrappableVisitor(visitor);
         isolate->SetEmbedderHeapTracer(visitor);

[haraken, 2016/06/03 12:32:06]

unique_ptr<ScriptWrappableVisitor> visitor = new ...;
isolate->SetEmbedderHeapTracer(visitor.get());
V8PerIsolateData::from(isolate)->setScriptWrappableVisitor(std::move(visitor));

     }
 
@@ -371,6 +372,7 @@ void V8Initializer::shutdownMainThread()
 {
     ASSERT(isMainThread());
     v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
+    isolate->SetEmbedderHeapTracer(nullptr);
     V8PerIsolateData::willBeDestroyed(isolate);
     V8PerIsolateData::destroy(isolate);
 }