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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 if (!m_accessedImage || !m_image->isImageResource() || !document.fetcher()) | 79 if (!m_accessedImage || !m_image->isImageResource() || !document.fetcher()) |
80 return; | 80 return; |
81 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL))
) | 81 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL))
) |
82 return; | 82 return; |
83 | 83 |
84 ImageResource* resource = m_image->cachedImage(); | 84 ImageResource* resource = m_image->cachedImage(); |
85 if (!resource) | 85 if (!resource) |
86 return; | 86 return; |
87 | 87 |
88 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty
() ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options()); | 88 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty
() ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options()); |
| 89 document.fetcher()->maybeNotifyInsecureContent(resource); |
89 document.fetcher()->requestLoadStarted(resource, request, ResourceFetcher::R
esourceLoadingFromCache); | 90 document.fetcher()->requestLoadStarted(resource, request, ResourceFetcher::R
esourceLoadingFromCache); |
90 } | 91 } |
91 | 92 |
92 bool CSSImageValue::hasFailedOrCanceledSubresources() const | 93 bool CSSImageValue::hasFailedOrCanceledSubresources() const |
93 { | 94 { |
94 if (!m_image || !m_image->isImageResource()) | 95 if (!m_image || !m_image->isImageResource()) |
95 return false; | 96 return false; |
96 if (Resource* cachedResource = toStyleFetchedImage(m_image)->cachedImage()) | 97 if (Resource* cachedResource = toStyleFetchedImage(m_image)->cachedImage()) |
97 return cachedResource->loadFailedOrCanceled(); | 98 return cachedResource->loadFailedOrCanceled(); |
98 return true; | 99 return true; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 { | 131 { |
131 KURL url = document.completeURL(m_relativeURL); | 132 KURL url = document.completeURL(m_relativeURL); |
132 if (url == m_absoluteURL) | 133 if (url == m_absoluteURL) |
133 return; | 134 return; |
134 m_absoluteURL = url.string(); | 135 m_absoluteURL = url.string(); |
135 m_accessedImage = false; | 136 m_accessedImage = false; |
136 m_image.clear(); | 137 m_image.clear(); |
137 } | 138 } |
138 | 139 |
139 } // namespace blink | 140 } // namespace blink |
OLD | NEW |