| 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 f8bdd8ae7eb31964f83930ff0a23a3687c819c21..1879f9d9d48e4418f904e75c22ab1c0e43df929d 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
|
| @@ -114,6 +114,9 @@ static void messageHandlerInMainThread(v8::Local<v8::Message> message, v8::Local
|
| ASSERT(isMainThread());
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
|
|
| + if (isolate->GetEnteredContext().IsEmpty())
|
| + return;
|
| +
|
| // If called during context initialization, there will be no entered context.
|
| ScriptState* scriptState = ScriptState::current(isolate);
|
| if (!scriptState->contextIsValid())
|
|
|