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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
117 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document) | 117 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document) |
118 { | 118 { |
119 ASSERT(m_fetched); | 119 ASSERT(m_fetched); |
120 ASSERT(document && document->fetcher()); | 120 ASSERT(document && document->fetcher()); |
121 | 121 |
122 const String resourceURL = document->completeURL(m_resource); | 122 const String resourceURL = document->completeURL(m_resource); |
123 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL))) | 123 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL))) |
124 return; | 124 return; |
125 | 125 |
126 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css); | 126 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css); |
127 document->fetcher()->notifyLoadedFromMemoryCache(m_fetched.get()); | |
Nate Chapin
2014/06/04 16:03:37
Why not call this in requestLoadStarted() instad o
eustas
2014/06/05 07:32:20
I've tried to preserve existing workflow.
Here is
| |
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 |