third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1975753006: Pull to refresh: Use new reload type RELOAD_MAIN_RESOURCE

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 1975753006: Pull to refresh: Use new reload type RELOAD_MAIN_RESOURCE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review #14 and #16 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/FrameFetchContextTest.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoaderTypes.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 6ddde49ceac1be74a16692f8beeddd78dc44f8dc..5e6682082a7783282c2ceb17f6ae2a443d4114d1 100644

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

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

@@ -137,7 +137,7 @@ ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item, W

ResourceRequest FrameLoader::resourceRequestForReload(FrameLoadType frameLoadType,

const KURL& overrideURL, ClientRedirectPolicy clientRedirectPolicy)

{

- ASSERT(frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadBypassingCache);

+ ASSERT(frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadMainResource || frameLoadType == FrameLoadTypeReloadBypassingCache);

WebCachePolicy cachePolicy = frameLoadType == FrameLoadTypeReloadBypassingCache ? WebCachePolicy::BypassingCache : WebCachePolicy::ValidatingCacheData;

if (!m_currentItem)

return ResourceRequest();

@@ -803,7 +803,7 @@ FrameLoadType FrameLoader::determineFrameLoadType(const FrameLoadRequest& reques

if (request.resourceRequest().url() == m_documentLoader->urlForHistory()) {

if (!request.originDocument())

- return FrameLoadTypeSame;

+ return FrameLoadTypeReloadMainResource;

return request.resourceRequest().httpMethod() == HTTPNames::POST ? FrameLoadTypeStandard : FrameLoadTypeReplaceCurrentItem;

}

@@ -1281,7 +1281,7 @@ bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission, const S

return (!isFormSubmission || equalIgnoringCase(httpMethod, HTTPNames::GET))

&& loadType != FrameLoadTypeReload

&& loadType != FrameLoadTypeReloadBypassingCache

- && loadType != FrameLoadTypeSame

+ && loadType != FrameLoadTypeReloadMainResource

&& loadType != FrameLoadTypeBackForward

&& url.hasFragmentIdentifier()

&& equalIgnoringFragmentIdentifier(m_frame->document()->url(), url)