third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1983913002: Test to see if we can bring in document data from Blink.

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 1983913002: Test to see if we can bring in document data from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: WebLocalFrameImpl::loadData Created 4 years, 7 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

« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('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 070cc944e239e79c7675f7221497e3f79029d7b7..b2ecd4bb2c482a727b49317a55b25e65f900507b 100644

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

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

@@ -200,7 +200,7 @@ void FrameLoader::init()

ResourceRequest initialRequest(KURL(ParsedURLString, emptyString()));

initialRequest.setRequestContext(WebURLRequest::RequestContextInternal);

initialRequest.setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTypeTopLevel : WebURLRequest::FrameTypeNested);

- m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, initialRequest, SubstituteData());

+ m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(), 0);

m_provisionalDocumentLoader->startLoadingMainResource();

m_frame->document()->cancelParsing();

m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);

@@ -1412,7 +1412,7 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty

if (!m_frame->host())

return;

- m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, request, frameLoadRequest.substituteData().isValid() ? frameLoadRequest.substituteData() : defaultSubstituteDataForURL(request.url()));

+ m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, request, frameLoadRequest.substituteData().isValid() ? frameLoadRequest.substituteData() : defaultSubstituteDataForURL(request.url()), (!!frameLoadRequest.originDocument() ? 1 : 2));

m_provisionalDocumentLoader->setNavigationType(navigationType);

m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(type == FrameLoadTypeReplaceCurrentItem);

m_provisionalDocumentLoader->setIsClientRedirect(frameLoadRequest.clientRedirect() == ClientRedirectPolicy::ClientRedirect);