Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Side by Side Diff: Source/core/animation/AnimatableUnknown.h

Issue 129133002: Update animation classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
30 30
31 #ifndef AnimatableUnknown_h 31 #ifndef AnimatableUnknown_h
32 #define AnimatableUnknown_h 32 #define AnimatableUnknown_h
33 33
34 #include "CSSValueKeywords.h" 34 #include "CSSValueKeywords.h"
35 #include "core/animation/AnimatableValue.h" 35 #include "core/animation/AnimatableValue.h"
36 #include "core/css/CSSValuePool.h" 36 #include "core/css/CSSValuePool.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 class AnimatableUnknown : public AnimatableValue { 40 class AnimatableUnknown FINAL : public AnimatableValue {
41 public: 41 public:
42 virtual ~AnimatableUnknown() { } 42 virtual ~AnimatableUnknown() { }
43 43
44 static PassRefPtr<AnimatableUnknown> create(PassRefPtr<CSSValue> value) 44 static PassRefPtr<AnimatableUnknown> create(PassRefPtr<CSSValue> value)
45 { 45 {
46 return adoptRef(new AnimatableUnknown(value)); 46 return adoptRef(new AnimatableUnknown(value));
47 } 47 }
48 static PassRefPtr<AnimatableUnknown> create(CSSValueID value) 48 static PassRefPtr<AnimatableUnknown> create(CSSValueID value)
49 { 49 {
50 return adoptRef(new AnimatableUnknown(cssValuePool().createIdentifierVal ue(value))); 50 return adoptRef(new AnimatableUnknown(cssValuePool().createIdentifierVal ue(value)));
51 } 51 }
52 52
53 PassRefPtr<CSSValue> toCSSValue() const { return m_value; } 53 PassRefPtr<CSSValue> toCSSValue() const { return m_value; }
54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())- >getValueID(); } 54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())- >getValueID(); }
55 55
56 protected: 56 protected:
57 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* val ue, double fraction) const OVERRIDE 57 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* val ue, double fraction) const OVERRIDE
58 { 58 {
59 return defaultInterpolateTo(this, value, fraction); 59 return defaultInterpolateTo(this, value, fraction);
60 } 60 }
61 61
62 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const { re turn true; } 62 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE { return true; }
63 63
64 private: 64 private:
65 explicit AnimatableUnknown(PassRefPtr<CSSValue> value) 65 explicit AnimatableUnknown(PassRefPtr<CSSValue> value)
66 : m_value(value) 66 : m_value(value)
67 { 67 {
68 ASSERT(m_value); 68 ASSERT(m_value);
69 } 69 }
70 virtual AnimatableType type() const OVERRIDE { return TypeUnknown; } 70 virtual AnimatableType type() const OVERRIDE { return TypeUnknown; }
71 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 71 virtual bool equalTo(const AnimatableValue*) const OVERRIDE;
72 72
73 const RefPtr<CSSValue> m_value; 73 const RefPtr<CSSValue> m_value;
74 }; 74 };
75 75
76 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown()); 76 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown());
77 77
78 inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const 78 inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const
79 { 79 {
80 const AnimatableUnknown* unknown = toAnimatableUnknown(value); 80 const AnimatableUnknown* unknown = toAnimatableUnknown(value);
81 return m_value == unknown->m_value || m_value->equals(*unknown->m_value); 81 return m_value == unknown->m_value || m_value->equals(*unknown->m_value);
82 } 82 }
83 83
84 } // namespace WebCore 84 } // namespace WebCore
85 85
86 #endif // AnimatableUnknown_h 86 #endif // AnimatableUnknown_h
OLDNEW
« no previous file with comments | « Source/core/animation/AnimatableTransform.h ('k') | Source/core/animation/AnimatableVisibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698