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

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

Issue 2231523002: Make ResourceFetcher return Resources with LoadError instead of nullptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, resolve comment rewrap conflicts. Created 4 years, 2 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 0ec415aa32abfb9c9fb37728af562ff67911c14e..8cda40e4f04cb8fbdaabf18afce64b13525f7ee3 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -432,6 +432,15 @@ Resource* ResourceFetcher::resourceForStaticData(
return resource;
}
+Resource* ResourceFetcher::resourceForBlockedRequest(
+ const FetchRequest& request,
+ const ResourceFactory& factory) {
+ Resource* resource = factory.create(request.resourceRequest(),
+ request.options(), request.charset());
+ resource->error(ResourceError::cancelledDueToAccessCheckError(request.url()));
+ return resource;
+}
+
void ResourceFetcher::moveCachedNonBlockingResourceToBlocking(
Resource* resource,
const FetchRequest& request) {
@@ -495,8 +504,10 @@ Resource* ResourceFetcher::requestResource(
factory.type(), request.resourceRequest(),
MemoryCache::removeFragmentIdentifierIfNeeded(request.url()),
request.options(), request.forPreload(),
- request.getOriginRestriction()))
- return nullptr;
+ request.getOriginRestriction())) {
+ DCHECK(!substituteData.forceSynchronousLoad());
+ return resourceForBlockedRequest(request, factory);
+ }
unsigned long identifier = createUniqueIdentifier();
request.mutableResourceRequest().setPriority(computeLoadPriority(
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.h ('k') | third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698