third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp - Issue 2112593003: [DevTools] Remove [V8] from InspectorInstrumentation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: migrated to inspector-protocol test Created 4 years, 5 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

« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/sources/debugger/resources/pause-on-blocked-script-url.js ('k') | third_party/WebKit/Source/core/dom/Document.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d7464e062606c5634c0b979b8fc6247717233d79..f5c668d369b7625c137010f6ede4194ed6d01374 100644

--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

@@ -266,8 +266,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())

return;

if (!initializeMainWorld())