Chromium Code Reviews| Index: Source/core/animation/DeferredAnimatableValue.h |
| diff --git a/Source/core/animation/AnimatableNeutral.h b/Source/core/animation/DeferredAnimatableValue.h |
| similarity index 73% |
| copy from Source/core/animation/AnimatableNeutral.h |
| copy to Source/core/animation/DeferredAnimatableValue.h |
| index e044ee825e7514a99776bcc03ea68c207ae9eb47..741e9b17bdba8b3263b6f78b1216cbddd241857e 100644 |
| --- a/Source/core/animation/AnimatableNeutral.h |
| +++ b/Source/core/animation/DeferredAnimatableValue.h |
| @@ -28,16 +28,17 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef AnimatableNeutral_h |
| -#define AnimatableNeutral_h |
| +#ifndef DeferredAnimatableValue_h |
| +#define DeferredAnimatableValue_h |
| #include "core/animation/AnimatableValue.h" |
| namespace WebCore { |
| -class AnimatableNeutral : public AnimatableValue { |
| +// Used as a sentinal value to indicate where a snapshot of an element's CSS value should go in a KeyframeAnimationEffect::KeyframeVector. |
| +class DeferredAnimatableValue : public AnimatableValue { |
|
Steve Block
2013/08/05 08:14:56
For the neutral value you use the name 'Animatable
|
| public: |
| - virtual ~AnimatableNeutral() { } |
| + virtual ~DeferredAnimatableValue() { } |
| virtual PassRefPtr<CSSValue> toCSSValue() const OVERRIDE |
| { |
| @@ -45,25 +46,30 @@ public: |
| return 0; |
| } |
| - virtual bool isNeutral() const OVERRIDE { return true; } |
| + virtual bool isDeferredSnapshot() const OVERRIDE { return true; } |
| protected: |
| - static PassRefPtr<AnimatableNeutral> create() { return adoptRef(new AnimatableNeutral()); } |
| + static PassRefPtr<DeferredAnimatableValue> create() { return adoptRef(new DeferredAnimatableValue()); } |
| - virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* value, double fraction) const OVERRIDE |
| + virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE |
| { |
| ASSERT_NOT_REACHED(); |
| return 0; |
| } |
| - virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue* value) const OVERRIDE { return defaultAddWith(this, value); } |
| + virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE |
| + { |
| + ASSERT_NOT_REACHED(); |
| + return 0; |
| + } |
| private: |
| - AnimatableNeutral() : AnimatableValue(TypeNeutral) { } |
| + DeferredAnimatableValue() : AnimatableValue(TypeDeferred) { } |
| friend class AnimatableValue; |
| }; |
| + |
| } // namespace WebCore |
| -#endif // AnimatableNeutral_h |
| +#endif // DeferredAnimatableValue_h |