third_party/WebKit/Source/core/fetch/FetchContext.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/FetchContext.cpp

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

Patch Set: self review, minor fixes 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

« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/core/fetch/FetchContext.h ('k') | third_party/WebKit/Source/core/fetch/ImageResource.cpp » ('j') | third_party/WebKit/public/web/WebFrame.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 61b816332253a21f23492945218122f2d19f8092..265234e20da204437f25737346d0cc8843f0cfcb 100644

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

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

@@ -29,7 +29,7 @@

#include "core/fetch/FetchContext.h"

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

namespace blink {

@@ -56,9 +56,9 @@ CachePolicy FetchContext::getCachePolicy() const

return CachePolicyVerify;

}

-ResourceRequestCachePolicy FetchContext::resourceRequestCachePolicy(const ResourceRequest&, Resource::Type) const

+WebCachePolicy FetchContext::resourceRequestCachePolicy(const ResourceRequest&, Resource::Type) const

{

- return UseProtocolCachePolicy;

+ return WebCachePolicy::UseProtocolCachePolicy;

}

void FetchContext::dispatchWillSendRequest(unsigned long, ResourceRequest&, const ResourceResponse&, const FetchInitiatorInfo&)