Index: Source/core/css/resolver/ElementStyleResources.cpp |
diff --git a/Source/core/css/resolver/ElementStyleResources.cpp b/Source/core/css/resolver/ElementStyleResources.cpp |
index 902c9d45e7873f8208a199921aab78f6dd108538..c64fdd2b3bdf50727a53f232429039a36881e811 100644 |
--- a/Source/core/css/resolver/ElementStyleResources.cpp |
+++ b/Source/core/css/resolver/ElementStyleResources.cpp |
@@ -37,18 +37,18 @@ ElementStyleResources::ElementStyleResources() |
{ |
} |
-PassRefPtr<StyleImage> ElementStyleResources::styleImage(Document& document, const TextLinkColors& textLinkColors, Color currentColor, CSSPropertyID property, CSSValue* value) |
+PassRefPtr<StyleImage> ElementStyleResources::styleImage(Document& document, const TextLinkColors& textLinkColors, Color currentColor, CSSPropertyID property, CSSValue value) |
{ |
- if (value->isImageValue()) |
+ if (value.isImageValue()) |
return cachedOrPendingFromValue(document, property, toCSSImageValue(value)); |
- if (value->isImageGeneratorValue()) |
- return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(value)); |
+ if (value.isImageGeneratorValue()) |
+ return generatedOrPendingFromValue(property, &toCSSImageGeneratorValue(value)); |
- if (value->isImageSetValue()) |
+ if (value.isImageSetValue()) |
return setOrPendingFromValue(property, toCSSImageSetValue(value)); |
- if (value->isCursorImageValue()) |
+ if (value.isCursorImageValue()) |
return cursorOrPendingFromValue(property, toCSSCursorImageValue(value)); |
return nullptr; |
@@ -63,31 +63,31 @@ PassRefPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPro |
return StyleGeneratedImage::create(value); |
} |
-PassRefPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue* value) |
+PassRefPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue& value) |
{ |
- RefPtr<StyleImage> image = value->cachedOrPendingImageSet(m_deviceScaleFactor); |
+ RefPtr<StyleImage> image = value.cachedOrPendingImageSet(m_deviceScaleFactor); |
if (image && image->isPendingImage()) |
- m_pendingImageProperties.set(property, value); |
+ m_pendingImageProperties.set(property, &value); |
return image.release(); |
} |
-PassRefPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(Document& document, CSSPropertyID property, CSSImageValue* value) |
+PassRefPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(Document& document, CSSPropertyID property, CSSImageValue& value) |
{ |
- RefPtr<StyleImage> image = value->cachedOrPendingImage(); |
+ RefPtr<StyleImage> image = value.cachedOrPendingImage(); |
if (image) { |
if (image->isPendingImage()) |
- m_pendingImageProperties.set(property, value); |
+ m_pendingImageProperties.set(property, &value); |
else |
- value->restoreCachedResourceIfNeeded(document); |
+ value.restoreCachedResourceIfNeeded(document); |
} |
return image.release(); |
} |
-PassRefPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue* value) |
+PassRefPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue& value) |
{ |
- RefPtr<StyleImage> image = value->cachedOrPendingImage(m_deviceScaleFactor); |
+ RefPtr<StyleImage> image = value.cachedOrPendingImage(m_deviceScaleFactor); |
if (image && image->isPendingImage()) |
- m_pendingImageProperties.set(property, value); |
+ m_pendingImageProperties.set(property, &value); |
return image.release(); |
} |