third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1846733004: Rename IgnoringCacheData to ValidatingCacheData

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 1846733004: Rename IgnoringCacheData to ValidatingCacheData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git cl format Created 4 years, 9 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/ImageLoader.cpp » ('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 a149585d361966d3dff12a19d58c08bde3eea7ab..182c91b8f6eeb9a57fdf03e7e116ecee12900989 100644

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

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

@@ -136,8 +136,7 @@ ResourceRequest FrameLoader::resourceRequestForReload(FrameLoadType frameLoadTyp

const KURL& overrideURL, ClientRedirectPolicy clientRedirectPolicy)

{

ASSERT(frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadFromOrigin);

- ResourceRequestCachePolicy cachePolicy = frameLoadType == FrameLoadTypeReloadFromOrigin ?

- ReloadBypassingCache : ReloadIgnoringCacheData;

+ ResourceRequestCachePolicy cachePolicy = frameLoadType == FrameLoadTypeReloadFromOrigin ? BypassingCache : ValidatingCacheData;

if (!m_currentItem)

return ResourceRequest();

ResourceRequest request = resourceRequestFromHistoryItem(m_currentItem.get(), cachePolicy);

@@ -774,9 +773,9 @@ FrameLoadType FrameLoader::determineFrameLoadType(const FrameLoadRequest& reques

return FrameLoadTypeStandard;

if (m_provisionalDocumentLoader && request.substituteData().failingURL() == m_provisionalDocumentLoader->url() && m_loadType == FrameLoadTypeBackForward)

return FrameLoadTypeBackForward;

- if (request.resourceRequest().getCachePolicy() == ReloadIgnoringCacheData)

+ if (request.resourceRequest().getCachePolicy() == ValidatingCacheData)

return FrameLoadTypeReload;

- if (request.resourceRequest().getCachePolicy() == ReloadBypassingCache)

+ if (request.resourceRequest().getCachePolicy() == BypassingCache)

return FrameLoadTypeReloadFromOrigin;

// From the HTML5 spec for location.assign():

// "If the browsing context's session history contains only one Document,