Index: chrome/browser/predictors/resource_prefetch_predictor.cc |
diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc |
index cbabd8d6c1eb69d8a0c373446944e4a88a17dfe9..729ceda1dac6df9df9f7baa5fae04b77f490afe4 100644 |
--- a/chrome/browser/predictors/resource_prefetch_predictor.cc |
+++ b/chrome/browser/predictors/resource_prefetch_predictor.cc |
@@ -248,11 +248,10 @@ bool ResourcePrefetchPredictor::IsHandledSubresource( |
std::string mime_type; |
response->GetMimeType(&mime_type); |
- if (!mime_type.empty() && !mime_util::IsSupportedImageMimeType(mime_type) && |
- !mime_util::IsSupportedJavascriptMimeType(mime_type) && |
- !net::MatchesMimeType("text/css", mime_type)) { |
+ const content::ResourceType resource_type = |
+ GetResourceTypeFromMimeType(mime_type, content::RESOURCE_TYPE_LAST_TYPE); |
+ if (resource_type == content::RESOURCE_TYPE_LAST_TYPE) |
resource_status |= RESOURCE_STATUS_UNSUPPORTED_MIME_TYPE; |
- } |
if (response->method() != "GET") |
resource_status |= RESOURCE_STATUS_NOT_GET; |
@@ -296,12 +295,16 @@ bool ResourcePrefetchPredictor::IsCacheable(const net::URLRequest* response) { |
content::ResourceType ResourcePrefetchPredictor::GetResourceTypeFromMimeType( |
const std::string& mime_type, |
content::ResourceType fallback) { |
- if (mime_util::IsSupportedImageMimeType(mime_type)) |
+ if (mime_type.empty()) |
+ return fallback; |
+ else if (mime_util::IsSupportedImageMimeType(mime_type)) |
return content::RESOURCE_TYPE_IMAGE; |
else if (mime_util::IsSupportedJavascriptMimeType(mime_type)) |
return content::RESOURCE_TYPE_SCRIPT; |
else if (net::MatchesMimeType("text/css", mime_type)) |
return content::RESOURCE_TYPE_STYLESHEET; |
+ else if (net::MatchesMimeType("application/font-woff", mime_type)) |
pasko
2016/07/28 14:04:04
let's add more mime types for fonts. I don't know
Benoit L
2016/07/28 16:11:53
Thank you for spotting this!
Done.
|
+ return content::RESOURCE_TYPE_FONT_RESOURCE; |
else |
return fallback; |
} |