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

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

Issue 295063002: [NotLanded] Implement the fetching algorithm of the Web Manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 8dc7481614f72fc59d67c9b5b728a3da3b345943..7b37030e177688f19eb5e300d5e320b7ea584295 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -89,15 +89,14 @@ static Resource* createResource(Resource::Type type, const ResourceRequest& requ
case Resource::Raw:
case Resource::TextTrack:
case Resource::Media:
+ case Resource::ImportResource:
return new RawResource(request, type);
case Resource::XSLStyleSheet:
return new XSLStyleSheetResource(request, charset);
case Resource::LinkPrefetch:
- return new Resource(request, Resource::LinkPrefetch);
case Resource::LinkSubresource:
- return new Resource(request, Resource::LinkSubresource);
- case Resource::ImportResource:
- return new RawResource(request, type);
+ case Resource::Manifest:
+ return new Resource(request, type);
}
ASSERT_NOT_REACHED();
@@ -119,6 +118,7 @@ static ResourceLoadPriority loadPriority(Resource::Type type, const FetchRequest
case Resource::Script:
case Resource::Font:
case Resource::ImportResource:
+ case Resource::Manifest:
return ResourceLoadPriorityMedium;
case Resource::Image:
// We'll default images to VeryLow, and promote whatever is visible. This improves
@@ -204,6 +204,7 @@ static ResourceRequest::TargetType requestTargetType(const ResourceFetcher* fetc
return ResourceRequest::TargetIsImage;
case Resource::Raw:
case Resource::ImportResource:
+ case Resource::Manifest:
return ResourceRequest::TargetIsSubresource;
case Resource::LinkPrefetch:
return ResourceRequest::TargetIsPrefetch;
@@ -389,6 +390,11 @@ ResourcePtr<RawResource> ResourceFetcher::fetchTextTrack(FetchRequest& request)
return toRawResource(requestResource(Resource::TextTrack, request));
}
+ResourcePtr<Resource> ResourceFetcher::fetchManifest(FetchRequest& request)
+{
+ return requestResource(Resource::Manifest, request);
+}
+
void ResourceFetcher::preCacheSubstituteDataForMainResource(const FetchRequest& request, const SubstituteData& substituteData)
{
const KURL& url = request.url();
@@ -434,6 +440,7 @@ bool ResourceFetcher::checkInsecureContent(Resource::Type type, const KURL& url,
case Resource::MainResource:
case Resource::LinkPrefetch:
case Resource::LinkSubresource:
+ case Resource::Manifest:
// These cannot affect the current document.
treatment = TreatAsAlwaysAllowedContent;
break;
@@ -492,6 +499,7 @@ bool ResourceFetcher::canRequest(Resource::Type type, const KURL& url, const Res
case Resource::TextTrack:
case Resource::ImportResource:
case Resource::Media:
+ case Resource::Manifest:
// By default these types of resources can be loaded from any origin.
// FIXME: Are we sure about Resource::Font?
if (originRestriction == FetchRequest::RestrictToSameOrigin && !securityOrigin->canRequest(url)) {
@@ -550,6 +558,7 @@ bool ResourceFetcher::canRequest(Resource::Type type, const KURL& url, const Res
case Resource::Raw:
case Resource::LinkPrefetch:
case Resource::LinkSubresource:
+ case Resource::Manifest:
break;
case Resource::Media:
case Resource::TextTrack:

Powered by Google App Engine
This is Rietveld 408576698