third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2608163009: Remove ScriptController::updateDocument

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 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:

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 7d064994811f9bdcc894363549fda2ad15364ac8..dafe916b9563d86da938dbe4cea8e5ddcac4a5ee 100644

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

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

@@ -1753,8 +1753,10 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject() {

return;

Settings* settings = m_frame->settings();

- if (settings && settings->getForceMainWorldInitialization())

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

+ if (settings && settings->getForceMainWorldInitialization()) {

+ // Forcibly instantiate WindowProxy.

+ m_frame->script().windowProxy(DOMWrapperWorld::mainWorld());

+ }

InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);

if (m_dispatchingDidClearWindowObjectInMainWorld)