third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner.

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 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change page popup plumbing, remove vestigal bits related to failing security context init Created 4 years, 10 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

« third_party/WebKit/Source/core/dom/SecurityContext.cpp ('K') | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/page/CreateWindow.cpp » ('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 038cf60a8afc2b21412fab348d49efb7f0661d53..871bc77ea6ea5182ca5386c54099e97c182d0e76 100644

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

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

@@ -325,7 +325,7 @@ void FrameLoader::replaceDocumentWhileExecutingJavaScriptURL(const String& sourc

// Prepare a DocumentInit before clearing the frame, because it may need to

// inherit an aliased security context.

- DocumentInit init(m_frame->document()->url(), m_frame);

+ DocumentInit init(ownerDocument, m_frame->document()->url(), m_frame);

init.withNewRegistrationContext();

stopAllLoaders();

@@ -343,7 +343,7 @@ void FrameLoader::replaceDocumentWhileExecutingJavaScriptURL(const String& sourc

return;

client()->transitionToCommittedForNewPage();

- documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source, ownerDocument);

+ documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source);

}

void FrameLoader::receivedMainResourceRedirect(const KURL& newURL)