Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSCursorImageValue.cpp

Index: Source/core/css/CSSCursorImageValue.cpp
diff --git a/Source/core/css/CSSCursorImageValue.cpp b/Source/core/css/CSSCursorImageValue.cpp
index 16e38f9d7c5ac93ce1c72c96f85b4ebf6ed26063..1609976dee61d3dfde86f7b4bb4d9639848df131 100644
--- a/Source/core/css/CSSCursorImageValue.cpp
+++ b/Source/core/css/CSSCursorImageValue.cpp
@@ -44,7 +44,7 @@ static inline SVGCursorElement* resourceReferencedByCursorElement(const String&
     return isSVGCursorElement(element) ? toSVGCursorElement(element) : 0;
 }
 
-CSSCursorImageValue::CSSCursorImageValue(PassRefPtrWillBeRawPtr<CSSValue> imageValue, bool hotSpotSpecified, const IntPoint& hotSpot)
+CSSCursorImageValue::CSSCursorImageValue(PassRefPtr<CSSValue> imageValue, bool hotSpotSpecified, const IntPoint& hotSpot)
     : CSSValue(CursorImageClass)
     , m_imageValue(imageValue)
     , m_hotSpotSpecified(hotSpotSpecified)
@@ -132,10 +132,10 @@ StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceSca
         // 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());
+            RefPtr<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()));
+                RefPtr<CSSImageValue> svgImageValue = CSSImageValue::create(document->completeURL(cursorElement->href()->currentValue()->value()));
                 svgImageValue->setReferrer(imageValue->referrer());
                 StyleFetchedImage* cachedImage = svgImageValue->cachedImage(document);
                 m_image = cachedImage;
@@ -148,7 +148,7 @@ StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceSca
     }
 
     if (m_image && m_image->isImageResource())
-        return toStyleFetchedImage(m_image);
+        return toStyleFetchedImage(m_image.get());
     return 0;
 }
 
@@ -167,7 +167,7 @@ StyleImage* CSSCursorImageValue::cachedOrPendingImage(float deviceScaleFactor)
 bool CSSCursorImageValue::isSVGCursor() const
 {
     if (m_imageValue->isImageValue()) {
-        RefPtrWillBeRawPtr<CSSImageValue> imageValue = toCSSImageValue(m_imageValue.get());
+        RefPtr<CSSImageValue> imageValue = toCSSImageValue(m_imageValue.get());
         KURL kurl(ParsedURLString, imageValue->url());
         return kurl.hasFragmentIdentifier();
     }
@@ -178,7 +178,7 @@ String CSSCursorImageValue::cachedImageURL()
 {
     if (!m_image || !m_image->isImageResource())
         return String();
-    return toStyleFetchedImage(m_image)->cachedImage()->url().string();
+    return toStyleFetchedImage(m_image.get())->cachedImage()->url().string();
 }
 
 void CSSCursorImageValue::clearImageResource()
@@ -200,11 +200,4 @@ bool CSSCursorImageValue::equals(const CSSCursorImageValue& other) const
         && compareCSSValuePtr(m_imageValue, other.m_imageValue);
 }
 
-DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue)
-{
-    visitor->trace(m_imageValue);
-    visitor->trace(m_image);
-    CSSValue::traceAfterDispatch(visitor);
-}
-
 } // namespace blink