| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #include "core/animation/AnimatableValue.h" | 34 #include "core/animation/AnimatableValue.h" |
| 35 #include "core/css/CSSCrossfadeValue.h" | 35 #include "core/css/CSSCrossfadeValue.h" |
| 36 #include "core/rendering/style/StyleImage.h" | 36 #include "core/rendering/style/StyleImage.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 class AnimatableImage FINAL : public AnimatableValue { | 40 class AnimatableImage FINAL : public AnimatableValue { |
| 41 public: | 41 public: |
| 42 virtual ~AnimatableImage() { } | 42 virtual ~AnimatableImage() { } |
| 43 static PassRefPtr<AnimatableImage> create(const StyleImage& image) | 43 static PassRefPtrWillBeRawPtr<AnimatableImage> create(const StyleImage& imag
e) |
| 44 { | 44 { |
| 45 return create(image.cssValue()); | 45 return create(image.cssValue()); |
| 46 } | 46 } |
| 47 CSSValue* toCSSValue() const { return m_value.get(); } | 47 CSSValue* toCSSValue() const { return m_value.get(); } |
| 48 | 48 |
| 49 virtual void trace(Visitor*) OVERRIDE { } |
| 50 |
| 49 protected: | 51 protected: |
| 50 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do
uble fraction) const OVERRIDE; | 52 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
leValue*, double fraction) const OVERRIDE; |
| 51 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV
ERRIDE; | 53 virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValu
e*) const OVERRIDE; |
| 52 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER
RIDE; | 54 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER
RIDE; |
| 53 | 55 |
| 54 private: | 56 private: |
| 55 static PassRefPtr<AnimatableImage> create(PassRefPtr<CSSValue> value) | 57 static PassRefPtrWillBeRawPtr<AnimatableImage> create(PassRefPtr<CSSValue> v
alue) |
| 56 { | 58 { |
| 57 return adoptRef(new AnimatableImage(value)); | 59 return adoptRefWillBeNoop(new AnimatableImage(value)); |
| 58 } | 60 } |
| 59 AnimatableImage(PassRefPtr<CSSValue> value) | 61 AnimatableImage(PassRefPtr<CSSValue> value) |
| 60 : m_value(value) | 62 : m_value(value) |
| 61 { | 63 { |
| 62 } | 64 } |
| 63 virtual AnimatableType type() const OVERRIDE { return TypeImage; } | 65 virtual AnimatableType type() const OVERRIDE { return TypeImage; } |
| 64 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; | 66 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; |
| 65 | 67 |
| 66 const RefPtr<CSSValue> m_value; | 68 const RefPtr<CSSValue> m_value; |
| 67 }; | 69 }; |
| 68 | 70 |
| 69 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage()); | 71 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage()); |
| 70 | 72 |
| 71 } // namespace WebCore | 73 } // namespace WebCore |
| 72 | 74 |
| 73 #endif // AnimatableImage_h | 75 #endif // AnimatableImage_h |
| OLD | NEW |