third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp - Issue 1829403002: Clean up font loading

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 1829403002: Clean up font loading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Resource_status

Patch Set: 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

« third_party/WebKit/Source/core/fetch/Resource.cpp ('K') | « third_party/WebKit/Source/core/fetch/Resource.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.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..2eab256f5582f2d817165b807bcb62a0d86d51da 100644

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

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

@@ -664,9 +664,7 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy

// affected by m_imagesEnabled but not m_autoLoadImages, in order to

// allow for this differing behavior.

// TODO(japhet): Can we get rid of one of these settings?

- if (FetchRequest::DeferredByClient == fetchRequest.defer())

- return Reload;

- if (existingResource->isImage() && !context().allowImage(m_imagesEnabled, existingResource->url()))

+ if (existingResource->isImage() && (FetchRequest::DeferredByClient == fetchRequest.defer() || !context().allowImage(m_imagesEnabled, existingResource->url())))

Takashi Toyoshima 2016/04/11 11:51:54 So, we will return USE for font resources even if

Nate Chapin 2016/04/11 18:47:32 Correct. This logic is a messy special-case for Im

return Reload;

// Never use cache entries for downloadToFile / useStreamOnResponse