summaryrefslogtreecommitdiff
path: root/chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h b/chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h
index 91b702d5161..5b8759ce45b 100644
--- a/chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h
+++ b/chromium/third_party/WebKit/Source/core/animation/AnimatableNeutral.h
@@ -41,7 +41,6 @@ public:
protected:
static PassRefPtr<AnimatableNeutral> create() { return adoptRef(new AnimatableNeutral()); }
-
virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* value, double fraction) const OVERRIDE
{
ASSERT_NOT_REACHED();
@@ -49,9 +48,13 @@ protected:
}
private:
- AnimatableNeutral() : AnimatableValue(TypeNeutral) { }
-
friend class AnimatableValue;
+ virtual AnimatableType type() const OVERRIDE { return TypeNeutral; }
+ virtual bool equalTo(const AnimatableValue* value) const OVERRIDE
+ {
+ ASSERT_NOT_REACHED();
+ return true;
+ }
};
} // namespace WebCore