| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 } | 98 } |
| 99 | 99 |
| 100 FontResource* CSSFontFaceSrcValue::fetch(Document* document) | 100 FontResource* CSSFontFaceSrcValue::fetch(Document* document) |
| 101 { | 101 { |
| 102 if (!m_fetched || m_fetched->isCORSFailed()) { | 102 if (!m_fetched || m_fetched->isCORSFailed()) { |
| 103 FetchRequest request(ResourceRequest(document->completeURL(m_resource)),
FetchInitiatorTypeNames::css); | 103 FetchRequest request(ResourceRequest(document->completeURL(m_resource)),
FetchInitiatorTypeNames::css); |
| 104 SecurityOrigin* securityOrigin = document->securityOrigin(); | 104 SecurityOrigin* securityOrigin = document->securityOrigin(); |
| 105 if (shouldSetCrossOriginAccessControl(request.url(), securityOrigin)) { | 105 if (shouldSetCrossOriginAccessControl(request.url(), securityOrigin)) { |
| 106 request.setCrossOriginAccessControl(securityOrigin, DoNotAllowStored
Credentials); | 106 request.setCrossOriginAccessControl(securityOrigin, DoNotAllowStored
Credentials); |
| 107 } | 107 } |
| 108 request.mutableResourceRequest().setHTTPReferrer(m_referrer); |
| 108 m_fetched = document->fetcher()->fetchFont(request); | 109 m_fetched = document->fetcher()->fetchFont(request); |
| 109 } else { | 110 } else { |
| 110 // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule | 111 // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule |
| 111 // is processed by StyleResolver / StyleEngine. | 112 // is processed by StyleResolver / StyleEngine. |
| 112 restoreCachedResourceIfNeeded(document); | 113 restoreCachedResourceIfNeeded(document); |
| 113 } | 114 } |
| 114 return m_fetched.get(); | 115 return m_fetched.get(); |
| 115 } | 116 } |
| 116 | 117 |
| 117 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document) | 118 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document) |
| 118 { | 119 { |
| 119 ASSERT(m_fetched); | 120 ASSERT(m_fetched); |
| 120 ASSERT(document && document->fetcher()); | 121 ASSERT(document && document->fetcher()); |
| 121 | 122 |
| 122 const String resourceURL = document->completeURL(m_resource); | 123 const String resourceURL = document->completeURL(m_resource); |
| 123 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL))) | 124 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL))) |
| 124 return; | 125 return; |
| 125 | 126 |
| 126 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::
css); | 127 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::
css); |
| 127 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe
tcher::ResourceLoadingFromCache); | 128 document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFe
tcher::ResourceLoadingFromCache); |
| 128 } | 129 } |
| 129 | 130 |
| 130 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const | 131 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const |
| 131 { | 132 { |
| 132 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou
rce == other.m_resource; | 133 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resou
rce == other.m_resource; |
| 133 } | 134 } |
| 134 | 135 |
| 135 } | 136 } |
| OLD | NEW |