| 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 4a354bc7fb70624629aa131c0352746359a4041c..bfba263c2257f9f3edbd7a07e4f22c6dc7e4db04 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
|
| @@ -198,7 +198,7 @@ v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Local<v8:
|
|
|
| bool ScriptController::initializeMainWorld()
|
| {
|
| - if (m_windowProxyManager->mainWorldProxy()->isContextInitialized())
|
| + if (m_windowProxyManager->mainWorldProxy()->isContextInitialized() || frame()->loader().stateMachine()->creatingInitialEmptyDocument())
|
| return false;
|
| return windowProxy(DOMWrapperWorld::mainWorld())->isContextInitialized();
|
| }
|
|
|