Store ScriptWrappableVisitor in V8PerIsolateData

third_party/WebKit/Source/bindings/core/v8/V8Initializer.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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 272 matching lines @@
             return policy->allowEval(ScriptState::from(context), ContentSecurityPolicy::SendReport, ContentSecurityPolicy::WillThrowException);
     }
     return false;
 }
 
 static void initializeV8Common(v8::Isolate* isolate)
 {
     isolate->AddGCPrologueCallback(V8GCController::gcPrologue);
     isolate->AddGCEpilogueCallback(V8GCController::gcEpilogue);
     if (RuntimeEnabledFeatures::traceWrappablesEnabled()) {
-        ScriptWrappableVisitor* visitor = new ScriptWrappableVisitor(isolate);
-        isolate->SetEmbedderHeapTracer(visitor);
+        std::unique_ptr<ScriptWrappableVisitor> visitor = std::unique_ptr<ScriptWrappableVisitor>(new ScriptWrappableVisitor(isolate));

[haraken, 2016/06/03 14:22:45]

std::unique_ptr<> visitor(new ...);

+        isolate->SetEmbedderHeapTracer(visitor.get());
+        V8PerIsolateData::from(isolate)->setScriptWrappableVisitor(std::move(visitor));
     }
 
     v8::Debug::SetLiveEditEnabled(isolate, false);
 
     isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kScoped);
 }
 
 namespace {
 
 class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ skipping 59 matching lines @@
     ThreadState::mainThreadState()->addInterruptor(adoptPtr(new V8IsolateInterruptor(isolate)));
     ThreadState::mainThreadState()->registerTraceDOMWrappers(isolate, V8GCController::traceDOMWrappers);
 
     V8PerIsolateData::from(isolate)->setThreadDebugger(adoptPtr(new MainThreadDebugger(isolate)));
 }
 
 void V8Initializer::shutdownMainThread()
 {
     ASSERT(isMainThread());
     v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
+    isolate->SetEmbedderHeapTracer(nullptr);
     V8PerIsolateData::willBeDestroyed(isolate);
     V8PerIsolateData::destroy(isolate);
 }
 
 static void reportFatalErrorInWorker(const char* location, const char* message)
 {
     // FIXME: We temporarily deal with V8 internal error situations such as out-of-memory by crashing the worker.
     CRASH();
 }
 
@@ skipping 42 matching lines @@
 
     isolate->AddMessageListener(messageHandlerInWorker);
     isolate->SetFatalErrorHandler(reportFatalErrorInWorker);
 
     uint32_t here;
     isolate->SetStackLimit(reinterpret_cast<uintptr_t>(&here - kWorkerMaxStackSize / sizeof(uint32_t*)));
     isolate->SetPromiseRejectCallback(promiseRejectHandlerInWorker);
 }
 
 } // namespace blink