Chromium Code Reviews| 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 4cc6e330efd5bad281f1abcc75d165419fdd1097..92c027fa91ebc9e094add6e62c5b94a9a1166dda 100644 |
| --- a/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp |
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp |
| @@ -25,6 +25,9 @@ |
| #include "bindings/core/v8/V8Initializer.h" |
| +#include <v8-debug.h> |
| +#include <v8-profiler.h> |
| +#include <memory> |
| #include "bindings/core/v8/DOMWrapperWorld.h" |
| #include "bindings/core/v8/RejectedPromises.h" |
| #include "bindings/core/v8/RetainedDOMInfo.h" |
| @@ -37,6 +40,7 @@ |
| #include "bindings/core/v8/V8ErrorEvent.h" |
| #include "bindings/core/v8/V8ErrorHandler.h" |
| #include "bindings/core/v8/V8GCController.h" |
| +#include "bindings/core/v8/V8HiddenValue.h" |
| #include "bindings/core/v8/V8IdleTaskRunner.h" |
| #include "bindings/core/v8/V8Location.h" |
| #include "bindings/core/v8/V8PerContextData.h" |
| @@ -62,9 +66,6 @@ |
| #include "wtf/RefPtr.h" |
| #include "wtf/text/WTFString.h" |
| #include "wtf/typed_arrays/ArrayBufferContents.h" |
| -#include <memory> |
| -#include <v8-debug.h> |
| -#include <v8-profiler.h> |
| namespace blink { |
| @@ -323,14 +324,17 @@ static void initializeV8Common(v8::Isolate* isolate) { |
| isolate->AddGCEpilogueCallback(V8GCController::gcEpilogue); |
| std::unique_ptr<ScriptWrappableVisitor> visitor( |
| new ScriptWrappableVisitor(isolate)); |
| - V8PerIsolateData::from(isolate)->setScriptWrappableVisitor( |
| - std::move(visitor)); |
| + V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); |
| + isolateData->setScriptWrappableVisitor(std::move(visitor)); |
| isolate->SetEmbedderHeapTracer( |
| V8PerIsolateData::from(isolate)->scriptWrappableVisitor()); |
| v8::Debug::SetLiveEditEnabled(isolate, false); |
| isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kScoped); |
| + |
| + V8HiddenValue::initialize(isolate); |
| + V8PrivateProperty::initialize(isolate); |
| } |
| namespace { |
| @@ -433,8 +437,7 @@ void V8Initializer::initializeMainThread() { |
| ScriptWrappableVisitor::invalidateDeadObjectsInMarkingDeque, |
| ScriptWrappableVisitor::performCleanup); |
| - V8PerIsolateData::from(isolate)->setThreadDebugger( |
| - WTF::makeUnique<MainThreadDebugger>(isolate)); |
| + ThreadDebugger::setThreadDebugger(isolate, new MainThreadDebugger(isolate)); |
|
jbroman
2017/02/15 02:25:23
This looks like it was more or less fine as-is. I'
adithyas
2017/02/15 18:12:12
I thought it was weird having a getter and setter
|
| } |
| static void reportFatalErrorInWorker(const char* location, |