Index: Source/bindings/core/v8/V8Initializer.cpp |
diff --git a/Source/bindings/core/v8/V8Initializer.cpp b/Source/bindings/core/v8/V8Initializer.cpp |
index 2aa92c2fc13dbd0998a77c5737eb4df4022e54b1..0673a60a10a2ea393c5b5bf1d1ed75e3088556a7 100644 |
--- a/Source/bindings/core/v8/V8Initializer.cpp |
+++ b/Source/bindings/core/v8/V8Initializer.cpp |
@@ -189,10 +189,6 @@ static void timerTraceProfilerInMainThread(const char* name, int status) |
static void initializeV8Common(v8::Isolate* isolate) |
{ |
- v8::ResourceConstraints constraints; |
- constraints.ConfigureDefaults(static_cast<uint64_t>(blink::Platform::current()->physicalMemoryMB()) << 20, static_cast<uint32_t>(blink::Platform::current()->virtualMemoryLimitMB()) << 20, static_cast<uint32_t>(blink::Platform::current()->numberOfProcessors())); |
- v8::SetResourceConstraints(isolate, &constraints); |
- |
v8::V8::AddGCPrologueCallback(V8GCController::gcPrologue); |
v8::V8::AddGCEpilogueCallback(V8GCController::gcEpilogue); |
@@ -201,7 +197,7 @@ static void initializeV8Common(v8::Isolate* isolate) |
isolate->SetAutorunMicrotasks(false); |
} |
-void V8Initializer::initializeMainThreadIfNeeded(v8::Isolate* isolate) |
+void V8Initializer::initializeMainThreadIfNeeded() |
{ |
ASSERT(isMainThread()); |
@@ -210,10 +206,13 @@ void V8Initializer::initializeMainThreadIfNeeded(v8::Isolate* isolate) |
return; |
initialized = true; |
+ gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode, v8ArrayBufferAllocator()); |
+ |
+ v8::Isolate* isolate = V8PerIsolateData::initialize(); |
+ |
initializeV8Common(isolate); |
v8::V8::SetFatalErrorHandler(reportFatalErrorInMainThread); |
- V8PerIsolateData::ensureInitialized(isolate); |
v8::V8::AddMessageListener(messageHandlerInMainThread); |
v8::V8::SetFailedAccessCheckCallbackFunction(failedAccessCheckCallbackInMainThread); |
v8::V8::SetAllowCodeGenerationFromStringsCallback(codeGenerationCheckCallbackInMainThread); |