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 de5bf4eb326da913141e184f8a1b6f9e0a73ff5d..f827ed479e694a9452adf0098290dddd5ec102e7 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp |
@@ -209,12 +209,6 @@ void ScriptController::executeScriptInMainWorld( |
InspectorUpdateCountersEvent::data()); |
} |
-bool ScriptController::initializeMainWorld() { |
- if (m_windowProxyManager->mainWorldProxy()->isContextInitialized()) |
- return false; |
- return windowProxy(DOMWrapperWorld::mainWorld())->isContextInitialized(); |
-} |
- |
WindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world) { |
WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); |
if (!windowProxy->isContextInitialized()) { |
@@ -303,13 +297,7 @@ void ScriptController::clearWindowProxy() { |
} |
void ScriptController::updateDocument() { |
- // For an uninitialized main window windowProxy, do not incur the cost of |
- // context initialization. |
- if (!m_windowProxyManager->mainWorldProxy()->isGlobalInitialized()) |
- return; |
- |
- if (!initializeMainWorld()) |
- windowProxy(DOMWrapperWorld::mainWorld())->updateDocument(); |
+ m_windowProxyManager->mainWorldProxy()->updateDocument(); |
} |
bool ScriptController::canExecuteScripts( |