| OLD | NEW |
| 1 /* | 1 /* |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 if (options.corsEnabled == IsCORSEnabled) | 59 if (options.corsEnabled == IsCORSEnabled) |
| 60 request.setCrossOriginAccessControl(document->securityOrigin(), opti
ons.allowCredentials, options.credentialsRequested); | 60 request.setCrossOriginAccessControl(document->securityOrigin(), opti
ons.allowCredentials, options.credentialsRequested); |
| 61 | 61 |
| 62 if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(reques
t, document->fetcher())) | 62 if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(reques
t, document->fetcher())) |
| 63 m_cachedImage = StyleFetchedImage::create(cachedImage.get(), documen
t); | 63 m_cachedImage = StyleFetchedImage::create(cachedImage.get(), documen
t); |
| 64 } | 64 } |
| 65 | 65 |
| 66 return m_cachedImage.get(); | 66 return m_cachedImage.get(); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) | 69 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) const |
| 70 { | 70 { |
| 71 if (m_isCachePending || !m_cachedImage || !document.fetcher()) | 71 if (m_isCachePending || !m_cachedImage || !document.fetcher()) |
| 72 return; | 72 return; |
| 73 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL))
) | 73 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL))
) |
| 74 return; | 74 return; |
| 75 | 75 |
| 76 ImageResource* resource = m_cachedImage->cachedImage(); | 76 ImageResource* resource = m_cachedImage->cachedImage(); |
| 77 if (!resource) | 77 if (!resource) |
| 78 return; | 78 return; |
| 79 | 79 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 KURL url = document.completeURL(m_relativeURL); | 118 KURL url = document.completeURL(m_relativeURL); |
| 119 AtomicString urlString(url.string()); | 119 AtomicString urlString(url.string()); |
| 120 if (urlString == m_absoluteURL) | 120 if (urlString == m_absoluteURL) |
| 121 return; | 121 return; |
| 122 m_absoluteURL = urlString; | 122 m_absoluteURL = urlString; |
| 123 m_isCachePending = true; | 123 m_isCachePending = true; |
| 124 m_cachedImage.clear(); | 124 m_cachedImage.clear(); |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |