third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp - Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums

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/fetch/ResourceFetcher.cpp

Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: hiroshige review Created 4 years, 8 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/fetch/ImageResource.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

index 036617aaed8c7b057bea49c18cbb98ceaf317d92..906ffa18187f55a49a7b4de2e14e5ab01e48fcbd 100644

--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

@@ -47,6 +47,7 @@

#include "platform/weborigin/SecurityOrigin.h"

#include "platform/weborigin/SecurityPolicy.h"

#include "public/platform/Platform.h"

+#include "public/platform/WebCachePolicy.h"

#include "public/platform/WebURL.h"

#include "public/platform/WebURLRequest.h"

#include "wtf/text/CString.h"

@@ -526,7 +527,7 @@ void ResourceFetcher::determineRequestContext(ResourceRequest& request, Resource

void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resource::Type type)

{

- if (request.getCachePolicy() == UseProtocolCachePolicy)

+ if (request.getCachePolicy() == WebCachePolicy::UseProtocolCachePolicy)

request.setCachePolicy(context().resourceRequestCachePolicy(request, type));

if (request.requestContext() == WebURLRequest::RequestContextUnspecified)

determineRequestContext(request, type);

@@ -695,7 +696,7 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy

if (m_allowStaleResources)

return Use;

- if (request.getCachePolicy() == ResourceRequestCachePolicy::BypassingCache)

+ if (request.getCachePolicy() == WebCachePolicy::BypassingCache)

return Reload;

if (!fetchRequest.options().canReuseRequest(existingResource->options()))