third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp - Issue 2151573002: [DevTools] Fix window object init on chrome://* pages

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 2151573002: [DevTools] Fix window object init on chrome://* pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments 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 | « chrome/browser/devtools/devtools_sanity_browsertest.cc ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('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 a02feadbf921199183b01f1476d03dea860693e2..fb9ae287cd5a482a2ed8e6d28c5e418e9b7bf147 100644

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

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

@@ -263,14 +263,8 @@ 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 (!forceMainWorldInitialization && !m_windowProxyManager->mainWorldProxy()->isGlobalInitialized())

+ if (!m_windowProxyManager->mainWorldProxy()->isGlobalInitialized())

return;

if (!initializeMainWorld())

« no previous file with comments | « chrome/browser/devtools/devtools_sanity_browsertest.cc ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »