Revert of Replace RawPtr with RefPtr on StylePendingImage

third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp

 /*
  * Copyright (C) 2006 Rob Buis <buis@kde.org>
  *           (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 10 matching lines @@
 
 #include "config.h"
 #include "core/css/CSSCursorImageValue.h"
 
 #include "core/SVGNames.h"
 #include "core/css/CSSImageSetValue.h"
 #include "core/fetch/ImageResource.h"
 #include "core/style/StyleFetchedImage.h"
 #include "core/style/StyleFetchedImageSet.h"
 #include "core/style/StyleImage.h"
+#include "core/style/StylePendingImage.h"
 #include "core/svg/SVGCursorElement.h"
 #include "core/svg/SVGLengthContext.h"
 #include "core/svg/SVGURIReference.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 static inline SVGCursorElement* resourceReferencedByCursorElement(const String& url, TreeScope& treeScope)
 {
     Element* element = SVGURIReference::targetElementFromIRIString(url, treeScope);
     return isSVGCursorElement(element) ? toSVGCursorElement(element) : nullptr;
 }
 
 CSSCursorImageValue::CSSCursorImageValue(PassRefPtrWillBeRawPtr<CSSValue> imageValue, bool hotSpotSpecified, const IntPoint& hotSpot)
     : CSSValue(CursorImageClass)
     , m_imageValue(imageValue)
     , m_hotSpotSpecified(hotSpotSpecified)
     , m_hotSpot(hotSpot)
-    , m_isCachePending(true)
+    , m_accessedImage(false)
 {
 }
 
 CSSCursorImageValue::~CSSCursorImageValue()
 {
     // The below teardown is all handled by weak pointer processing in oilpan.
 #if !ENABLE(OILPAN)
     if (!isSVGCursor())
         return;
 
@@ skipping 47 matching lines @@
         m_referencedElements.add(svgElement);
 #endif
         svgElement->setCursorImageValue(this);
         cursorElement->addClient(svgElement);
         return true;
     }
 
     return false;
 }
 
-bool CSSCursorImageValue::isCachePending(float deviceScaleFactor) const
-{
-    // Need to delegate completely so that changes in device scale factor can be handled appropriately.
-    if (m_imageValue->isImageSetValue())
-        return toCSSImageSetValue(*m_imageValue).isCachePending(deviceScaleFactor);
-    return m_isCachePending;
-}
-
-StyleImage* CSSCursorImageValue::cachedImage(float deviceScaleFactor)
-{
-    ASSERT(!isCachePending(deviceScaleFactor));
-
-    if (m_imageValue->isImageSetValue())
-        return toCSSImageSetValue(*m_imageValue).cachedImageSet(deviceScaleFactor);
-    return m_cachedImage.get();
-}
-
-StyleImage* CSSCursorImageValue::cacheImage(Document* document, float deviceScaleFactor)
+StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceScaleFactor)
 {
     if (m_imageValue->isImageSetValue())
-        return toCSSImageSetValue(*m_imageValue).cacheImageSet(document, deviceScaleFactor);
+        return toCSSImageSetValue(m_imageValue.get())->cachedImageSet(document, deviceScaleFactor);
 
-    if (m_isCachePending) {
-        m_isCachePending = false;
+    if (!m_accessedImage) {
+        m_accessedImage = true;
 
         // For SVG images we need to lazily substitute in the correct URL. Rather than attempt
         // to change the URL of the CSSImageValue (which would then change behavior like cssText),
         // we create an alternate CSSImageValue to use.
         if (isSVGCursor() && document) {
             RefPtrWillBeRawPtr<CSSImageValue> imageValue = toCSSImageValue(m_imageValue.get());
             // FIXME: This will fail if the <cursor> element is in a shadow DOM (bug 59827)
             if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(imageValue->url(), *document)) {
                 RefPtrWillBeRawPtr<CSSImageValue> svgImageValue = CSSImageValue::create(document->completeURL(cursorElement->href()->currentValue()->value()));
                 svgImageValue->setReferrer(imageValue->referrer());
-                StyleFetchedImage* cachedImage = svgImageValue->cacheImage(document);
-                m_cachedImage = cachedImage;
+                StyleFetchedImage* cachedImage = svgImageValue->cachedImage(document);
+                m_image = cachedImage;
                 return cachedImage;
             }
         }
 
         if (m_imageValue->isImageValue())
-            m_cachedImage = toCSSImageValue(*m_imageValue).cacheImage(document);
+            m_image = toCSSImageValue(m_imageValue.get())->cachedImage(document);
     }
 
-    if (m_cachedImage && m_cachedImage->isImageResource())
-        return toStyleFetchedImage(m_cachedImage);
+    if (m_image && m_image->isImageResource())
+        return toStyleFetchedImage(m_image);
     return nullptr;
 }
 
+StyleImage* CSSCursorImageValue::cachedOrPendingImage(float deviceScaleFactor)
+{
+    // Need to delegate completely so that changes in device scale factor can be handled appropriately.
+    if (m_imageValue->isImageSetValue())
+        return toCSSImageSetValue(m_imageValue.get())->cachedOrPendingImageSet(deviceScaleFactor);
+
+    if (!m_image)
+        m_image = StylePendingImage::create(this);
+
+    return m_image.get();
+}
+
 bool CSSCursorImageValue::isSVGCursor() const
 {
     if (m_imageValue->isImageValue()) {
         RefPtrWillBeRawPtr<CSSImageValue> imageValue = toCSSImageValue(m_imageValue.get());
         KURL kurl(ParsedURLString, imageValue->url());
         return kurl.hasFragmentIdentifier();
     }
     return false;
 }
 
 String CSSCursorImageValue::cachedImageURL()
 {
-    if (!m_cachedImage || !m_cachedImage->isImageResource())
+    if (!m_image || !m_image->isImageResource())
         return String();
-    return toStyleFetchedImage(m_cachedImage)->cachedImage()->url().string();
+    return toStyleFetchedImage(m_image)->cachedImage()->url().string();
 }
 
 void CSSCursorImageValue::clearImageResource()
 {
-    m_cachedImage = nullptr;
-    m_isCachePending = true;
+    m_image = nullptr;
+    m_accessedImage = false;
 }
 
 #if !ENABLE(OILPAN)
 void CSSCursorImageValue::removeReferencedElement(SVGElement* element)
 {
     m_referencedElements.remove(element);
 }
 #endif
 
 bool CSSCursorImageValue::equals(const CSSCursorImageValue& other) const
 {
     return (m_hotSpotSpecified ? other.m_hotSpotSpecified && m_hotSpot == other.m_hotSpot : !other.m_hotSpotSpecified)
         && compareCSSValuePtr(m_imageValue, other.m_imageValue);
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue)
 {
     visitor->trace(m_imageValue);
-    visitor->trace(m_cachedImage);
+    visitor->trace(m_image);
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink