Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
index 602e2bd0ff793506ad32db9548b2391e406c612b..b0e2168e0c3ae03f8cb8915a0b7abcb96571c123 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
@@ -472,10 +472,9 @@ void ScriptController::executeScriptInIsolatedWorld( |
RefPtr<DOMWrapperWorld> world = |
DOMWrapperWorld::ensureIsolatedWorld(isolate(), worldID, extensionGroup); |
WindowProxy* isolatedWorldWindowProxy = windowProxy(*world); |
- if (!isolatedWorldWindowProxy->isContextInitialized()) |
- return; |
- |
ScriptState* scriptState = isolatedWorldWindowProxy->getScriptState(); |
+ if (!scriptState->contextIsValid()) |
+ return; |
v8::Context::Scope scope(scriptState->context()); |
v8::Local<v8::Array> resultArray = v8::Array::New(isolate(), sources.size()); |