Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

Issue 2608163009: Remove ScriptController::updateDocument (Closed)
Patch Set: temp Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698