Index: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp |
diff --git a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp |
index e7c97033812eedc79e26e428fdb11b7d3a73a6ef..a63d36cfc71a959b73a1fa0b7d69960577d15292 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp |
@@ -34,6 +34,16 @@ |
namespace blink { |
+namespace { |
+ |
+PassRefPtrWillBeRawPtr<StylePendingImage> createStylePendingImage(const CSSValue& value) |
+{ |
+ // TODO(sashab): Remove this const_cast and this function once create() can take a PassRefPtrWillBeRawPtr<const CSSValue>. |
+ return StylePendingImage::create(const_cast<CSSValue*>(&value)); |
+} |
+ |
+} // namespace |
+ |
ElementStyleResources::ElementStyleResources() |
: m_deviceScaleFactor(1) |
{ |
@@ -60,16 +70,17 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFrom |
{ |
if (value.isPending()) { |
m_pendingImageProperties.add(property); |
- return StylePendingImage::create(value); |
+ return createStylePendingImage(value); |
} |
- return StyleGeneratedImage::create(value); |
+ // TODO(sashab): Remove this const_cast once create() can take a PassRefPtrWillBeRawPtr<const CSSValue>. |
+ return StyleGeneratedImage::create(const_cast<CSSImageGeneratorValue*>(&value)); |
} |
PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, const CSSImageSetValue& value) |
{ |
if (value.isCachePending(m_deviceScaleFactor)) { |
m_pendingImageProperties.add(property); |
- return StylePendingImage::create(value); |
+ return createStylePendingImage(value); |
} |
return value.cachedImageSet(m_deviceScaleFactor); |
} |
@@ -78,7 +89,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromVal |
{ |
if (value.isCachePending()) { |
m_pendingImageProperties.add(property); |
- return StylePendingImage::create(value); |
+ return createStylePendingImage(value); |
} |
value.restoreCachedResourceIfNeeded(document); |
return value.cachedImage(); |
@@ -88,7 +99,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cursorOrPendingFromVal |
{ |
if (value.isCachePending(m_deviceScaleFactor)) { |
m_pendingImageProperties.add(property); |
- return StylePendingImage::create(value); |
+ return createStylePendingImage(value); |
} |
return value.cachedImage(m_deviceScaleFactor); |
} |