third_party/WebKit/Source/core/loader/FrameLoader.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/core/loader/FrameLoader.cpp

Issue 2151573002: [DevTools] Fix window object init on chrome://* pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: a 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

« chrome/browser/devtools/devtools_sanity_browsertest.cc ('K') | « third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp ('k') | third_party/WebKit/Source/devtools/front_end/Tests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

index 9aef6de6289d0a67ca59036a9ed386ce55120b07..1431feae0faf44a7cf50e5eb592df6e29a2eaa95 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -1542,6 +1542,10 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject()

if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))

return;

+ Settings* settings = m_frame->settings();

+ bool forceMainWorldInitialization = settings && settings->forceMainWorldInitialization();

+ if (forceMainWorldInitialization)

dgozman 2016/07/13 18:40:59 Please inline it: if (settings && settings->force

kozy 2016/07/13 18:57:26 Done.

+ m_frame->script().initializeMainWorld();

InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);

if (m_dispatchingDidClearWindowObjectInMainWorld)