Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(701)

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Issue 2266913002: DevTools Disable cache should properly handle LoadOnlyFromCache resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use shouldBlockRequest instead Created 4 years, 4 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
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 c1f88f74f3e4406cfe576744ec167659253852e3..6e4595022864c8434483b21b066f2e7a5d5e9b21 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -431,14 +431,15 @@ Resource* ResourceFetcher::requestResource(FetchRequest& request, const Resource
if (!request.url().isValid())
return nullptr;
- if (!context().canRequest(factory.type(), request.resourceRequest(), MemoryCache::removeFragmentIdentifierIfNeeded(request.url()), request.options(), request.forPreload(), request.getOriginRestriction())) {
- return resourceForBlockedRequest(request, factory, substituteData.forceSynchronousLoad());
- }
-
unsigned long identifier = createUniqueIdentifier();
request.mutableResourceRequest().setPriority(computeLoadPriority(factory.type(), request, ResourcePriority::NotVisible));
initializeResourceRequest(request.mutableResourceRequest(), factory.type(), request.defer());
context().willStartLoadingResource(identifier, request.mutableResourceRequest(), factory.type());
+
+ if (!context().canRequest(factory.type(), request.resourceRequest(), MemoryCache::removeFragmentIdentifierIfNeeded(request.url()), request.options(), request.forPreload(), request.getOriginRestriction())) {
+ return resourceForBlockedRequest(request, factory, substituteData.forceSynchronousLoad());
+ }
+
if (!request.url().isValid())
Nate Chapin 2016/08/23 17:56:48 Should this check move above canRequest() too?
jkarlin 2016/08/23 18:14:28 Done.
return nullptr;

Powered by Google App Engine
This is Rietveld 408576698