| Index: Source/core/css/CSSImageValue.cpp
|
| diff --git a/Source/core/css/CSSImageValue.cpp b/Source/core/css/CSSImageValue.cpp
|
| index c4c6b7908d4f683764658f06c2e0ec6c29f2ac86..627a12a4faaeaa38fd73a2a193629d15b8bc31dc 100644
|
| --- a/Source/core/css/CSSImageValue.cpp
|
| +++ b/Source/core/css/CSSImageValue.cpp
|
| @@ -72,7 +72,7 @@ StyleFetchedImage* CSSImageValue::cachedImage(Document* document, const Resource
|
| m_image = StyleFetchedImage::create(cachedImage.get(), document);
|
| }
|
|
|
| - return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image) : 0;
|
| + return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image.get()) : 0;
|
| }
|
|
|
| void CSSImageValue::restoreCachedResourceIfNeeded(Document& document)
|
| @@ -96,7 +96,7 @@ bool CSSImageValue::hasFailedOrCanceledSubresources() const
|
| {
|
| if (!m_image || !m_image->isImageResource())
|
| return false;
|
| - if (Resource* cachedResource = toStyleFetchedImage(m_image)->cachedImage())
|
| + if (Resource* cachedResource = toStyleFetchedImage(m_image.get())->cachedImage())
|
| return cachedResource->loadFailedOrCanceled();
|
| return true;
|
| }
|
| @@ -116,12 +116,6 @@ bool CSSImageValue::knownToBeOpaque(const LayoutObject* layoutObject) const
|
| return m_image ? m_image->knownToBeOpaque(layoutObject) : false;
|
| }
|
|
|
| -DEFINE_TRACE_AFTER_DISPATCH(CSSImageValue)
|
| -{
|
| - visitor->trace(m_image);
|
| - CSSValue::traceAfterDispatch(visitor);
|
| -}
|
| -
|
| void CSSImageValue::reResolveURL(const Document& document)
|
| {
|
| KURL url = document.completeURL(m_relativeURL);
|
|
|