third_party/WebKit/Source/core/frame/LocalFrame.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/frame/LocalFrame.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: Make initSecurityContext private. 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

« extensions/browser/app_window/app_window_contents.cc ('K') | « third_party/WebKit/Source/core/dom/SecurityContext.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp

diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

index 15161faa4dcb7882692ff8645199a611fbf15140..403cb63e1224204836c9bb5bc16ec302e8be9754 100644

--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp

+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

@@ -768,7 +768,12 @@ bool LocalFrame::isURLAllowed(const KURL& url) const

bool LocalFrame::shouldReuseDefaultView(const KURL& url) const

{

- return loader().stateMachine()->isDisplayingInitialEmptyDocument() && document()->isSecureTransitionTo(url);

+ // Secure transitions can only happen when navigating from the initial empty

+ // document.

+ if (!loader().stateMachine()->isDisplayingInitialEmptyDocument())

+ return false;

+ return document()->isSecureTransitionTo(url);

}

void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words)