third_party/WebKit/Source/core/loader/FrameFetchContext.cpp - Issue 1987413002: Add link preload as=document support

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/FrameFetchContext.cpp

Issue 1987413002: Add link preload as=document support Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: crash fix Created 4 years, 3 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/FrameFetchContext.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

index 1d8a489187bf24ba71847999558509e59898b068..10f6537b910c422c16313e92e5069c65db638e7f 100644

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

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

@@ -394,11 +394,11 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(unsigned long ide

dispatchDidFinishLoading(identifier, 0, 0);

}

-bool FrameFetchContext::shouldLoadNewResource(Resource::Type type) const

+bool FrameFetchContext::shouldLoadNewResource(Resource::Type type, const WebURLRequest::FrameType frameType) const

{

if (!m_documentLoader)

return true;

- if (type == Resource::MainResource)

+ if (type == Resource::MainResource && frameType != WebURLRequest::FrameTypePreload)

return m_documentLoader == frame()->loader().provisionalDocumentLoader();

return m_documentLoader == frame()->loader().documentLoader();

}