| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 { | 85 { |
| 86 if (!m_fetched) | 86 if (!m_fetched) |
| 87 return false; | 87 return false; |
| 88 return m_fetched->loadFailedOrCanceled(); | 88 return m_fetched->loadFailedOrCanceled(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 bool CSSFontFaceSrcValue::shouldSetCrossOriginAccessControl(const KURL& resource
, SecurityOrigin* securityOrigin) | 91 bool CSSFontFaceSrcValue::shouldSetCrossOriginAccessControl(const KURL& resource
, SecurityOrigin* securityOrigin) |
| 92 { | 92 { |
| 93 if (resource.isLocalFile() || resource.protocolIsData()) | 93 if (resource.isLocalFile() || resource.protocolIsData()) |
| 94 return false; | 94 return false; |
| 95 if (m_fetched && m_fetched->isCORSFailed()) | |
| 96 return false; | |
| 97 return !securityOrigin->canRequest(resource); | 95 return !securityOrigin->canRequest(resource); |
| 98 } | 96 } |
| 99 | 97 |
| 100 FontResource* CSSFontFaceSrcValue::fetch(Document* document) | 98 FontResource* CSSFontFaceSrcValue::fetch(Document* document) |
| 101 { | 99 { |
| 102 if (!m_fetched || m_fetched->isCORSFailed()) { | 100 if (!m_fetched) { |
| 103 FetchRequest request(ResourceRequest(document->completeURL(m_resource)),
FetchInitiatorTypeNames::css); | 101 FetchRequest request(ResourceRequest(document->completeURL(m_resource)),
FetchInitiatorTypeNames::css); |
| 104 SecurityOrigin* securityOrigin = document->securityOrigin(); | 102 SecurityOrigin* securityOrigin = document->securityOrigin(); |
| 105 if (shouldSetCrossOriginAccessControl(request.url(), securityOrigin)) { | 103 if (shouldSetCrossOriginAccessControl(request.url(), securityOrigin)) { |
| 106 request.setCrossOriginAccessControl(securityOrigin, DoNotAllowStored
Credentials); | 104 request.setCrossOriginAccessControl(securityOrigin, DoNotAllowStored
Credentials); |
| 107 } | 105 } |
| 108 request.mutableResourceRequest().setHTTPReferrer(m_referrer); | 106 request.mutableResourceRequest().setHTTPReferrer(m_referrer); |
| 109 m_fetched = document->fetcher()->fetchFont(request); | 107 m_fetched = document->fetcher()->fetchFont(request); |
| 110 } else { | 108 } else { |
| 111 // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule | 109 // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule |
| 112 // is processed by StyleResolver / StyleEngine. | 110 // is processed by StyleResolver / StyleEngine. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 127 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::
css); | 125 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::
css); |
| 128 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe
tcher::ResourceLoadingFromCache); | 126 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe
tcher::ResourceLoadingFromCache); |
| 129 } | 127 } |
| 130 | 128 |
| 131 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const | 129 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const |
| 132 { | 130 { |
| 133 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou
rce == other.m_resource; | 131 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou
rce == other.m_resource; |
| 134 } | 132 } |
| 135 | 133 |
| 136 } | 134 } |
| OLD | NEW |