Move Image ownership out of CSSValue

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 102 matching lines @@
         m_referencedElements.add(svgElement);
 #endif
         svgElement->setCursorImageValue(this);
         cursorElement->addClient(svgElement);
         return true;
     }
 
     return false;
 }
 
-StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceScaleFactor)
+StyleImage* CSSCursorImageValue::cachedImage(Document* document, CSSStyleImageMap& imageMap, float deviceScaleFactor)
 {
     if (m_imageValue->isImageSetValue())
         return toCSSImageSetValue(m_imageValue.get())->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());
             // 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->cachedImage(document);
+                StyleFetchedImage* cachedImage = svgImageValue->cachedImage(document, imageMap);
                 m_image = cachedImage;
                 return cachedImage;
             }
         }
 
         if (m_imageValue->isImageValue())
-            m_image = toCSSImageValue(m_imageValue.get())->cachedImage(document);
+            m_image = toCSSImageValue(m_imageValue.get())->cachedImage(document, imageMap);
     }
 
     if (m_image && m_image->isImageResource())
         return toStyleFetchedImage(m_image);
     return 0;
 }
 
-StyleImage* CSSCursorImageValue::cachedOrPendingImage(float deviceScaleFactor)
+StyleImage* CSSCursorImageValue::cachedOrPendingImage(CSSStyleImageMap& imageMap, 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();
 }
@@ skipping 35 matching lines @@
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue)
 {
     visitor->trace(m_imageValue);
     visitor->trace(m_image);
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink