| OLD | NEW |
| 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 Loading... |
| 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 wi
th the old WinIE style of font-face, | 47 // Normally we would just check the format, but in order to avoid conflicts wi
th the old WinIE style of font-face, |
| 47 // we will also check to see if the URL ends with .eot. If so, we'll go ahead
and assume that we shouldn't load it. | 48 // we will also check to see if the URL ends with .eot. If so, we'll go ahead
and assume that we shouldn't load it. |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // allowFileAccessFromFileURLs is false. | 80 // allowFileAccessFromFileURLs is false. |
| 80 if (request.url().isLocalFile()) | 81 if (request.url().isLocalFile()) |
| 81 return; | 82 return; |
| 82 | 83 |
| 83 request.setCrossOriginAccessControl(securityOrigin, | 84 request.setCrossOriginAccessControl(securityOrigin, |
| 84 CrossOriginAttributeAnonymous); | 85 CrossOriginAttributeAnonymous); |
| 85 } | 86 } |
| 86 | 87 |
| 87 FontResource* CSSFontFaceSrcValue::fetch(Document* document) const { | 88 FontResource* CSSFontFaceSrcValue::fetch(Document* document) const { |
| 88 if (!m_fetched) { | 89 if (!m_fetched) { |
| 89 FetchRequest request(ResourceRequest(m_absoluteResource), | 90 ResourceRequest resourceRequest(m_absoluteResource); |
| 90 FetchInitiatorTypeNames::css); | 91 resourceRequest.setIsCacheAwareLoadingEnabled( |
| 92 RuntimeEnabledFeatures::webFontsCacheAwareTimeoutAdaptionEnabled()); |
| 93 FetchRequest request(resourceRequest, FetchInitiatorTypeNames::css); |
| 91 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy); | 94 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy); |
| 92 SecurityOrigin* securityOrigin = document->getSecurityOrigin(); | 95 SecurityOrigin* securityOrigin = document->getSecurityOrigin(); |
| 93 setCrossOriginAccessControl(request, securityOrigin); | 96 setCrossOriginAccessControl(request, securityOrigin); |
| 94 request.mutableResourceRequest().setHTTPReferrer( | 97 request.mutableResourceRequest().setHTTPReferrer( |
| 95 SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, | 98 SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, |
| 96 request.url(), m_referrer.referrer)); | 99 request.url(), m_referrer.referrer)); |
| 97 FontResource* resource = FontResource::fetch(request, document->fetcher()); | 100 FontResource* resource = FontResource::fetch(request, document->fetcher()); |
| 98 if (!resource) | 101 if (!resource) |
| 99 return nullptr; | 102 return nullptr; |
| 100 m_fetched = FontResourceHelper::create(resource); | 103 m_fetched = FontResourceHelper::create(resource); |
| (...skipping 28 matching lines...) Expand all Loading... |
| 129 ResourceFetcher::ResourceLoadingFromCache); | 132 ResourceFetcher::ResourceLoadingFromCache); |
| 130 } | 133 } |
| 131 | 134 |
| 132 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const { | 135 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const { |
| 133 return m_isLocal == other.m_isLocal && m_format == other.m_format && | 136 return m_isLocal == other.m_isLocal && m_format == other.m_format && |
| 134 m_specifiedResource == other.m_specifiedResource && | 137 m_specifiedResource == other.m_specifiedResource && |
| 135 m_absoluteResource == other.m_absoluteResource; | 138 m_absoluteResource == other.m_absoluteResource; |
| 136 } | 139 } |
| 137 | 140 |
| 138 } // namespace blink | 141 } // namespace blink |
| OLD | NEW |