Index: Source/core/animation/AnimatableImage.h |
diff --git a/Source/core/animation/AnimatableImage.h b/Source/core/animation/AnimatableImage.h |
index f8b1f5cee3c85b6fb582b27aabc84b2d20344dbc..1c88d4c736948be5f05e7268b11a7797af73a202 100644 |
--- a/Source/core/animation/AnimatableImage.h |
+++ b/Source/core/animation/AnimatableImage.h |
@@ -40,11 +40,12 @@ |
class AnimatableImage FINAL : public AnimatableValue { |
public: |
virtual ~AnimatableImage() { } |
- static PassRefPtr<AnimatableImage> create(PassRefPtr<CSSValue> value) |
+ static PassRefPtr<AnimatableImage> create(StyleImage* image) |
{ |
- return adoptRef(new AnimatableImage(value)); |
+ return adoptRef(new AnimatableImage(image)); |
} |
- CSSValue* toCSSValue() const { return m_value.get(); } |
+ PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_image->cssValue(); } |
+ StyleImage* toStyleImage() const { return m_image.get(); } |
protected: |
virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE; |
@@ -52,16 +53,15 @@ |
virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVERRIDE; |
private: |
- AnimatableImage(PassRefPtr<CSSValue> value) |
- : m_value(value) |
+ AnimatableImage(StyleImage* image) |
+ : m_image(image) |
{ |
- ASSERT(m_value); |
- ASSERT(m_value->isImageValue() || m_value->isImageSetValue() || m_value->isGradientValue() || m_value->isCrossfadeValue() || m_value->isCursorImageValue()); |
+ ASSERT(m_image); |
} |
virtual AnimatableType type() const OVERRIDE { return TypeImage; } |
virtual bool equalTo(const AnimatableValue*) const OVERRIDE; |
- const RefPtr<CSSValue> m_value; |
+ const RefPtr<StyleImage> m_image; |
}; |
DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage()); |