CSSValue Immediates: Change CSSValue to an object instead of a pointer

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 26 matching lines @@
 #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) : 0;
 }
 
-CSSCursorImageValue::CSSCursorImageValue(PassRefPtrWillBeRawPtr<CSSValue> imageValue, bool hotSpotSpecified, const IntPoint& hotSpot)
-    : CSSValue(CursorImageClass)
+CSSCursorImageValue::CSSCursorImageValue(CSSValue imageValue, bool hotSpotSpecified, const IntPoint& hotSpot)
+    : CSSValueObject(CursorImageClass)
     , m_imageValue(imageValue)
     , m_hotSpotSpecified(hotSpotSpecified)
     , m_hotSpot(hotSpot)
     , m_accessedImage(false)
 {
 }
 
 CSSCursorImageValue::~CSSCursorImageValue()
 {
     // The below teardown is all handled by weak pointer processing in oilpan.
 #if !ENABLE(OILPAN)
     if (!isSVGCursor())
         return;
 
     HashSet<SVGElement*>::const_iterator it = m_referencedElements.begin();
     HashSet<SVGElement*>::const_iterator end = m_referencedElements.end();
-    String url = toCSSImageValue(m_imageValue.get())->url();
+    String url = toCSSImageValue(m_imageValue).url();
 
     for (; it != end; ++it) {
         SVGElement* referencedElement = *it;
         referencedElement->cursorImageValueRemoved();
         if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(url, referencedElement->treeScope()))
             cursorElement->removeClient(referencedElement);
     }
 #endif
 }
 
 String CSSCursorImageValue::customCSSText() const
 {
     StringBuilder result;
-    result.append(m_imageValue->cssText());
+    result.append(m_imageValue.cssText());
     if (m_hotSpotSpecified) {
         result.append(' ');
         result.appendNumber(m_hotSpot.x());
         result.append(' ');
         result.appendNumber(m_hotSpot.y());
     }
     return result.toString();
 }
 
 bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
 {
     if (!element || !element->isSVGElement())
         return false;
 
     if (!isSVGCursor())
         return false;
 
-    String url = toCSSImageValue(m_imageValue.get())->url();
+    String url = toCSSImageValue(m_imageValue).url();
     if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(url, element->treeScope())) {
         // FIXME: This will override hot spot specified in CSS, which is probably incorrect.
         SVGLengthContext lengthContext(0);
         m_hotSpotSpecified = true;
         float x = roundf(cursorElement->x()->currentValue()->value(lengthContext));
         m_hotSpot.setX(static_cast<int>(x));
 
         float y = roundf(cursorElement->y()->currentValue()->value(lengthContext));
         m_hotSpot.setY(static_cast<int>(y));
 
         if (cachedImageURL() != element->document().completeURL(cursorElement->href()->currentValue()->value()))
             clearImageResource();
 
         SVGElement* svgElement = toSVGElement(element);
 #if !ENABLE(OILPAN)
         m_referencedElements.add(svgElement);
 #endif
         svgElement->setCursorImageValue(this);
         cursorElement->addClient(svgElement);
         return true;
     }
 
     return false;
 }
 
 StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceScaleFactor)
 {
-    if (m_imageValue->isImageSetValue())
-        return toCSSImageSetValue(m_imageValue.get())->cachedImageSet(document, deviceScaleFactor);
+    if (m_imageValue.isImageSetValue())
+        return toCSSImageSetValue(m_imageValue).cachedImageSet(document, deviceScaleFactor);
 
     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());
+            CSSImageValue& imageValue = toCSSImageValue(m_imageValue);
             // FIXME: This will fail if the <cursor> element is in a shadow DOM (bug 59827)
-            if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(imageValue->url(), *document)) {
+            if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(imageValue.url(), *document)) {
                 RefPtrWillBeRawPtr<CSSImageValue> svgImageValue = CSSImageValue::create(document->completeURL(cursorElement->href()->currentValue()->value()));
-                svgImageValue->setReferrer(imageValue->referrer());
+                svgImageValue->setReferrer(imageValue.referrer());
                 StyleFetchedImage* cachedImage = svgImageValue->cachedImage(document);
                 m_image = cachedImage;
                 return cachedImage;
             }
         }
 
-        if (m_imageValue->isImageValue())
-            m_image = toCSSImageValue(m_imageValue.get())->cachedImage(document);
+        if (m_imageValue.isImageValue())
+            m_image = toCSSImageValue(m_imageValue).cachedImage(document);
     }
 
     if (m_image && m_image->isImageResource())
         return toStyleFetchedImage(m_image);
     return 0;
 }
 
 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_imageValue.isImageSetValue())
+        return toCSSImageSetValue(m_imageValue).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());
+    if (m_imageValue.isImageValue()) {
+        CSSImageValue& imageValue = toCSSImageValue(m_imageValue);
+        KURL kurl(ParsedURLString, imageValue.url());
         return kurl.hasFragmentIdentifier();
     }
     return false;
 }
 
 String CSSCursorImageValue::cachedImageURL()
 {
     if (!m_image || !m_image->isImageResource())
         return String();
     return toStyleFetchedImage(m_image)->cachedImage()->url().string();
 }
 
 void CSSCursorImageValue::clearImageResource()
 {
     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);
+        && m_imageValue.equals(other.m_imageValue);
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue)
 {
     visitor->trace(m_imageValue);
-    CSSValue::traceAfterDispatch(visitor);
+    CSSValueObject::traceAfterDispatch(visitor);
 }
 
 } // namespace blink