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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp

Issue 2390583002: [WIP] WebFonts cache-aware timeout adaption (Closed)
Patch Set: check ERR_CACHE_MISS directly in ResourceError Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 17 matching lines...) Expand all
28 #include "core/css/CSSMarkup.h" 28 #include "core/css/CSSMarkup.h"
29 #include "core/css/StyleSheetContents.h" 29 #include "core/css/StyleSheetContents.h"
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 #include "core/dom/Node.h" 31 #include "core/dom/Node.h"
32 #include "core/fetch/FetchInitiatorTypeNames.h" 32 #include "core/fetch/FetchInitiatorTypeNames.h"
33 #include "core/fetch/FetchRequest.h" 33 #include "core/fetch/FetchRequest.h"
34 #include "core/fetch/FontResource.h" 34 #include "core/fetch/FontResource.h"
35 #include "core/fetch/ResourceFetcher.h" 35 #include "core/fetch/ResourceFetcher.h"
36 #include "core/loader/MixedContentChecker.h" 36 #include "core/loader/MixedContentChecker.h"
37 #include "platform/CrossOriginAttributeValue.h" 37 #include "platform/CrossOriginAttributeValue.h"
38 #include "platform/RuntimeEnabledFeatures.h"
38 #include "platform/fonts/FontCache.h" 39 #include "platform/fonts/FontCache.h"
39 #include "platform/fonts/FontCustomPlatformData.h" 40 #include "platform/fonts/FontCustomPlatformData.h"
40 #include "platform/weborigin/SecurityPolicy.h" 41 #include "platform/weborigin/SecurityPolicy.h"
41 #include "wtf/text/StringBuilder.h" 42 #include "wtf/text/StringBuilder.h"
42 43
43 namespace blink { 44 namespace blink {
44 45
45 bool CSSFontFaceSrcValue::isSupportedFormat() const { 46 bool CSSFontFaceSrcValue::isSupportedFormat() const {
46 // Normally we would just check the format, but in order to avoid conflicts 47 // Normally we would just check the format, but in order to avoid conflicts
47 // with the old WinIE style of font-face, we will also check to see if the URL 48 // with the old WinIE style of font-face, we will also check to see if the URL
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 return; 84 return;
84 85
85 request.setCrossOriginAccessControl(securityOrigin, 86 request.setCrossOriginAccessControl(securityOrigin,
86 CrossOriginAttributeAnonymous); 87 CrossOriginAttributeAnonymous);
87 } 88 }
88 89
89 FontResource* CSSFontFaceSrcValue::fetch(Document* document) const { 90 FontResource* CSSFontFaceSrcValue::fetch(Document* document) const {
90 if (!m_fetched) { 91 if (!m_fetched) {
91 FetchRequest request(ResourceRequest(m_absoluteResource), 92 FetchRequest request(ResourceRequest(m_absoluteResource),
92 FetchInitiatorTypeNames::css); 93 FetchInitiatorTypeNames::css);
94 request.setIsCacheAwareLoadingEnabled(
95 RuntimeEnabledFeatures::webFontsCacheAwareTimeoutAdaptationEnabled());
93 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy); 96 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
94 SecurityOrigin* securityOrigin = document->getSecurityOrigin(); 97 SecurityOrigin* securityOrigin = document->getSecurityOrigin();
95 setCrossOriginAccessControl(request, securityOrigin); 98 setCrossOriginAccessControl(request, securityOrigin);
96 request.mutableResourceRequest().setHTTPReferrer( 99 request.mutableResourceRequest().setHTTPReferrer(
97 SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, 100 SecurityPolicy::generateReferrer(m_referrer.referrerPolicy,
98 request.url(), m_referrer.referrer)); 101 request.url(), m_referrer.referrer));
99 FontResource* resource = FontResource::fetch(request, document->fetcher()); 102 FontResource* resource = FontResource::fetch(request, document->fetcher());
100 if (!resource) 103 if (!resource)
101 return nullptr; 104 return nullptr;
102 m_fetched = FontResourceHelper::create(resource); 105 m_fetched = FontResourceHelper::create(resource);
(...skipping 28 matching lines...) Expand all
131 ResourceFetcher::ResourceLoadingFromCache); 134 ResourceFetcher::ResourceLoadingFromCache);
132 } 135 }
133 136
134 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const { 137 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const {
135 return m_isLocal == other.m_isLocal && m_format == other.m_format && 138 return m_isLocal == other.m_isLocal && m_format == other.m_format &&
136 m_specifiedResource == other.m_specifiedResource && 139 m_specifiedResource == other.m_specifiedResource &&
137 m_absoluteResource == other.m_absoluteResource; 140 m_absoluteResource == other.m_absoluteResource;
138 } 141 }
139 142
140 } // namespace blink 143 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698