third_party/WebKit/Source/core/loader/ImageLoader.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/loader/ImageLoader.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/loader/FrameLoader.cpp ('k') | third_party/WebKit/Source/core/loader/NavigationScheduler.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/loader/ImageLoader.cpp

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

index 5c9ed3d01576cc0345c8b58dbb429816054c644b..a3431c2792d0e81b4eee24674e14ee374ada3c7f 100644

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

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

@@ -48,6 +48,7 @@

#include "platform/Logging.h"

#include "platform/weborigin/SecurityOrigin.h"

#include "platform/weborigin/SecurityPolicy.h"

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

#include "public/platform/WebURLRequest.h"

namespace blink {

@@ -305,7 +306,7 @@ void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior, Up

ResourceLoaderOptions resourceLoaderOptions = ResourceFetcher::defaultResourceOptions();

ResourceRequest resourceRequest(url);

if (updateBehavior == UpdateForcedReload) {

- resourceRequest.setCachePolicy(ResourceRequestCachePolicy::BypassingCache);

+ resourceRequest.setCachePolicy(WebCachePolicy::BypassingCache);

resourceRequest.setLoFiState(WebURLRequest::LoFiOff);

// ImageLoader defers the load of images when in an ImageDocument.

// Don't defer this load on a forced reload.