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

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

Issue 2112593003: [DevTools] Remove [V8] from InspectorInstrumentation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup, moving csp event to dom debugger Created 4 years, 6 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 8da91443214551132f080d9eead172b608684b1b..18554840e963296263302283beed37ba7aab8ea0 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
@@ -277,8 +277,14 @@ void ScriptController::collectIsolatedContexts(Vector<std::pair<ScriptState*, Se
void ScriptController::updateDocument()
{
+ bool forceMainWorldInitialization = false;
+ if (canExecuteScripts(NotAboutToExecuteScript) && !frame()->loader().stateMachine()->creatingInitialEmptyDocument()) {
+ Settings* settings = frame()->settings();
+ forceMainWorldInitialization = settings && settings->forceMainWorldInitialization();
+ }
+
// For an uninitialized main window windowProxy, do not incur the cost of context initialization.
- if (!m_windowProxyManager->mainWorldProxy()->isGlobalInitialized())
+ if (!forceMainWorldInitialization && !m_windowProxyManager->mainWorldProxy()->isGlobalInitialized())
haraken 2016/07/01 02:28:03 Hmm, it looks a bit nasty to force the main world
dgozman 2016/07/06 17:02:20 Alternatives are LocalDOMWindow::installNewDocumen
return;
if (!initializeMainWorld())

Powered by Google App Engine
This is Rietveld 408576698