Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(413)

Unified Diff: Source/core/css/CSSCursorImageValue.cpp

Issue 1308953009: Move Image ownership out of CSSValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSCursorImageValue.h ('k') | Source/core/css/CSSGradientValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSCursorImageValue.cpp
diff --git a/Source/core/css/CSSCursorImageValue.cpp b/Source/core/css/CSSCursorImageValue.cpp
index 16e38f9d7c5ac93ce1c72c96f85b4ebf6ed26063..77a48c3483966cdb1a38279237533401856f8905 100644
--- a/Source/core/css/CSSCursorImageValue.cpp
+++ b/Source/core/css/CSSCursorImageValue.cpp
@@ -120,7 +120,7 @@ bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
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);
@@ -137,14 +137,14 @@ StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceSca
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())
@@ -152,7 +152,7 @@ StyleImage* CSSCursorImageValue::cachedImage(Document* document, float deviceSca
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())
« no previous file with comments | « Source/core/css/CSSCursorImageValue.h ('k') | Source/core/css/CSSGradientValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698