Chromium Code Reviews| Index: Source/bindings/v8/ScriptController.cpp |
| diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp |
| index 62146cf8e3f97726693078c9903832c0800bc74f..94c3f76179d258e4aa7d1d35c422b619a6aead6f 100644 |
| --- a/Source/bindings/v8/ScriptController.cpp |
| +++ b/Source/bindings/v8/ScriptController.cpp |
| @@ -473,8 +473,8 @@ int ScriptController::contextDebugId(v8::Handle<v8::Context> context) |
| void ScriptController::updateDocument() |
| { |
| - // For an uninitialized main window shell, do not incur the cost of context initialization during FrameLoader::init(). |
| - if ((!m_windowShell->isContextInitialized() || !m_windowShell->isGlobalInitialized()) && m_frame->loader().stateMachine()->creatingInitialEmptyDocument()) |
| + // For an uninitialized main window shell, do not incur the cost of context initialization. |
| + if (!m_windowShell->isContextInitialized() || !m_windowShell->isGlobalInitialized() || m_frame->loader().stateMachine()->creatingInitialEmptyDocument()) |
|
dcarney
2014/04/30 07:01:13
is it possible that the third condition is enough
kouhei (in TOK)
2014/04/30 07:04:53
No. In this patch, we want to avoid creating windo
dcarney
2014/04/30 07:11:49
Ok, I see what you mean. I remember needing it wh
kouhei (in TOK)
2014/04/30 07:25:44
I think this should be 'if (!m_windowShell->isGlob
|
| return; |
| if (!initializeMainWorld()) |