Source/WebCore/loader/FrameLoader.cpp - Issue 9565031: Merge 109369

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: Source/WebCore/loader/FrameLoader.cpp

Issue 9565031: Merge 109369 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 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

Index: Source/WebCore/loader/FrameLoader.cpp

===================================================================

--- Source/WebCore/loader/FrameLoader.cpp (revision 109443)

+++ Source/WebCore/loader/FrameLoader.cpp (working copy)

@@ -250,7 +250,6 @@

void FrameLoader::changeLocation(SecurityOrigin* securityOrigin, const KURL& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool refresh)

{

- RefPtr<Frame> protect(m_frame);

urlSelected(FrameLoadRequest(securityOrigin, ResourceRequest(url, referrer, refresh ? ReloadIgnoringCacheData : UseProtocolCachePolicy), "_self"),

0, lockHistory, lockBackForwardList, MaybeSendReferrer, ReplaceDocumentIfJavaScriptURL);

}

@@ -267,6 +266,7 @@

{

ASSERT(!m_suppressOpenerInNewFrame);

+ RefPtr<Frame> protect(m_frame);

FrameLoadRequest frameRequest(passedRequest);

if (m_frame->script()->executeIfJavaScriptURL(frameRequest.resourceRequest().url(), shouldReplaceDocumentIfJavaScriptURL))

« no previous file with comments | « LayoutTests/fast/frames/url-selected-crash-expected.txt ('k') | no next file » | no next file with comments »