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

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

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef InterpolableValue_h 5 #ifndef InterpolableValue_h
6 #define InterpolableValue_h 6 #define InterpolableValue_h
7 7
8 #include "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "core/animation/animatable/AnimatableValue.h" 9 #include "core/animation/animatable/AnimatableValue.h"
10 #include "platform/heap/Handle.h" 10 #include "platform/heap/Handle.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 friend class AnimationInterpolableValueTest; 44 friend class AnimationInterpolableValueTest;
45 }; 45 };
46 46
47 class CORE_EXPORT InterpolableNumber final : public InterpolableValue { 47 class CORE_EXPORT InterpolableNumber final : public InterpolableValue {
48 public: 48 public:
49 static PassOwnPtrWillBeRawPtr<InterpolableNumber> create(double value) 49 static PassOwnPtrWillBeRawPtr<InterpolableNumber> create(double value)
50 { 50 {
51 return adoptPtrWillBeNoop(new InterpolableNumber(value)); 51 return adoptPtrWillBeNoop(new InterpolableNumber(value));
52 } 52 }
53 53
54 virtual bool isNumber() const override final { return true; } 54 bool isNumber() const final { return true; }
55 double value() const { return m_value; } 55 double value() const { return m_value; }
56 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(m_value); } 56 PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return creat e(m_value); }
57 57
58 private: 58 private:
59 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; 59 void interpolate(const InterpolableValue& to, const double progress, Interpo lableValue& result) const final;
60 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final; 60 void add(const InterpolableValue& rhs, InterpolableValue& result) const fina l;
61 virtual void multiply(double scalar, InterpolableValue& result) const overri de final; 61 void multiply(double scalar, InterpolableValue& result) const final;
62 double m_value; 62 double m_value;
63 63
64 explicit InterpolableNumber(double value) 64 explicit InterpolableNumber(double value)
65 : m_value(value) 65 : m_value(value)
66 { 66 {
67 } 67 }
68 68
69 }; 69 };
70 70
71 class CORE_EXPORT InterpolableBool final : public InterpolableValue { 71 class CORE_EXPORT InterpolableBool final : public InterpolableValue {
72 public: 72 public:
73 static PassOwnPtrWillBeRawPtr<InterpolableBool> create(bool value) 73 static PassOwnPtrWillBeRawPtr<InterpolableBool> create(bool value)
74 { 74 {
75 return adoptPtrWillBeNoop(new InterpolableBool(value)); 75 return adoptPtrWillBeNoop(new InterpolableBool(value));
76 } 76 }
77 77
78 virtual bool isBool() const override final { return true; } 78 bool isBool() const final { return true; }
79 bool value() const { return m_value; } 79 bool value() const { return m_value; }
80 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(m_value); } 80 PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return creat e(m_value); }
81 81
82 private: 82 private:
83 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; 83 void interpolate(const InterpolableValue& to, const double progress, Interpo lableValue& result) const final;
84 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final; 84 void add(const InterpolableValue& rhs, InterpolableValue& result) const fina l;
85 virtual void multiply(double scalar, InterpolableValue& result) const overri de final { ASSERT_NOT_REACHED(); } 85 void multiply(double scalar, InterpolableValue& result) const final { ASSERT _NOT_REACHED(); }
86 bool m_value; 86 bool m_value;
87 87
88 explicit InterpolableBool(bool value) 88 explicit InterpolableBool(bool value)
89 : m_value(value) 89 : m_value(value)
90 { 90 {
91 } 91 }
92 92
93 }; 93 };
94 94
95 class CORE_EXPORT InterpolableList : public InterpolableValue { 95 class CORE_EXPORT InterpolableList : public InterpolableValue {
96 public: 96 public:
97 // Explicitly delete operator= because MSVC automatically generate 97 // Explicitly delete operator= because MSVC automatically generate
98 // copy constructors and operator= for dll-exported classes. 98 // copy constructors and operator= for dll-exported classes.
99 // Since InterpolableList is not copyable, automatically generated 99 // Since InterpolableList is not copyable, automatically generated
100 // operator= causes MSVC compiler error. 100 // operator= causes MSVC compiler error.
101 // However, we cannot use WTF_MAKE_NONCOPYABLE because InterpolableList 101 // However, we cannot use WTF_MAKE_NONCOPYABLE because InterpolableList
102 // has its own copy constructor. So just delete operator= here. 102 // has its own copy constructor. So just delete operator= here.
103 InterpolableList& operator=(const InterpolableList&) = delete; 103 InterpolableList& operator=(const InterpolableList&) = delete;
104 104
105 static PassOwnPtrWillBeRawPtr<InterpolableList> create(const InterpolableLis t &other) 105 static PassOwnPtrWillBeRawPtr<InterpolableList> create(const InterpolableLis t &other)
106 { 106 {
107 return adoptPtrWillBeNoop(new InterpolableList(other)); 107 return adoptPtrWillBeNoop(new InterpolableList(other));
108 } 108 }
109 109
110 static PassOwnPtrWillBeRawPtr<InterpolableList> create(size_t size) 110 static PassOwnPtrWillBeRawPtr<InterpolableList> create(size_t size)
111 { 111 {
112 return adoptPtrWillBeNoop(new InterpolableList(size)); 112 return adoptPtrWillBeNoop(new InterpolableList(size));
113 } 113 }
114 114
115 virtual bool isList() const override final { return true; } 115 bool isList() const final { return true; }
116 void set(size_t position, PassOwnPtrWillBeRawPtr<InterpolableValue> value) 116 void set(size_t position, PassOwnPtrWillBeRawPtr<InterpolableValue> value)
117 { 117 {
118 ASSERT(position < m_size); 118 ASSERT(position < m_size);
119 m_values[position] = value; 119 m_values[position] = value;
120 } 120 }
121 const InterpolableValue* get(size_t position) const 121 const InterpolableValue* get(size_t position) const
122 { 122 {
123 ASSERT(position < m_size); 123 ASSERT(position < m_size);
124 return m_values[position].get(); 124 return m_values[position].get();
125 } 125 }
126 size_t length() const { return m_size; } 126 size_t length() const { return m_size; }
127 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(*this); } 127 PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return creat e(*this); }
128 128
129 DECLARE_VIRTUAL_TRACE(); 129 DECLARE_VIRTUAL_TRACE();
130 130
131 private: 131 private:
132 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; 132 void interpolate(const InterpolableValue& to, const double progress, Interpo lableValue& result) const final;
133 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final; 133 void add(const InterpolableValue& rhs, InterpolableValue& result) const fina l;
134 virtual void multiply(double scalar, InterpolableValue& result) const overri de final; 134 void multiply(double scalar, InterpolableValue& result) const final;
135 explicit InterpolableList(size_t size) 135 explicit InterpolableList(size_t size)
136 : m_size(size) 136 : m_size(size)
137 , m_values(m_size) 137 , m_values(m_size)
138 { 138 {
139 } 139 }
140 140
141 InterpolableList(const InterpolableList& other) 141 InterpolableList(const InterpolableList& other)
142 : m_size(other.m_size) 142 : m_size(other.m_size)
143 , m_values(m_size) 143 , m_values(m_size)
144 { 144 {
145 for (size_t i = 0; i < m_size; i++) 145 for (size_t i = 0; i < m_size; i++)
146 set(i, other.m_values[i]->clone()); 146 set(i, other.m_values[i]->clone());
147 } 147 }
148 148
149 size_t m_size; 149 size_t m_size;
150 WillBeHeapVector<OwnPtrWillBeMember<InterpolableValue>> m_values; 150 WillBeHeapVector<OwnPtrWillBeMember<InterpolableValue>> m_values;
151 }; 151 };
152 152
153 // FIXME: Remove this when we can. 153 // FIXME: Remove this when we can.
154 class InterpolableAnimatableValue : public InterpolableValue { 154 class InterpolableAnimatableValue : public InterpolableValue {
155 public: 155 public:
156 static PassOwnPtrWillBeRawPtr<InterpolableAnimatableValue> create(PassRefPtr WillBeRawPtr<AnimatableValue> value) 156 static PassOwnPtrWillBeRawPtr<InterpolableAnimatableValue> create(PassRefPtr WillBeRawPtr<AnimatableValue> value)
157 { 157 {
158 return adoptPtrWillBeNoop(new InterpolableAnimatableValue(value)); 158 return adoptPtrWillBeNoop(new InterpolableAnimatableValue(value));
159 } 159 }
160 160
161 virtual bool isAnimatableValue() const override final { return true; } 161 bool isAnimatableValue() const final { return true; }
162 AnimatableValue* value() const { return m_value.get(); } 162 AnimatableValue* value() const { return m_value.get(); }
163 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(m_value); } 163 PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const final { return creat e(m_value); }
164 164
165 DECLARE_VIRTUAL_TRACE(); 165 DECLARE_VIRTUAL_TRACE();
166 166
167 private: 167 private:
168 virtual void interpolate(const InterpolableValue &to, const double progress, InterpolableValue& result) const override final; 168 void interpolate(const InterpolableValue &to, const double progress, Interpo lableValue& result) const final;
169 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final { ASSERT_NOT_REACHED(); } 169 void add(const InterpolableValue& rhs, InterpolableValue& result) const fina l { ASSERT_NOT_REACHED(); }
170 virtual void multiply(double scalar, InterpolableValue& result) const overri de final { ASSERT_NOT_REACHED(); } 170 void multiply(double scalar, InterpolableValue& result) const final { ASSERT _NOT_REACHED(); }
171 RefPtrWillBeMember<AnimatableValue> m_value; 171 RefPtrWillBeMember<AnimatableValue> m_value;
172 172
173 InterpolableAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value) 173 InterpolableAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value)
174 : m_value(value) 174 : m_value(value)
175 { 175 {
176 } 176 }
177 }; 177 };
178 178
179 DEFINE_TYPE_CASTS(InterpolableNumber, InterpolableValue, value, value->isNumber( ), value.isNumber()); 179 DEFINE_TYPE_CASTS(InterpolableNumber, InterpolableValue, value, value->isNumber( ), value.isNumber());
180 DEFINE_TYPE_CASTS(InterpolableBool, InterpolableValue, value, value->isBool(), v alue.isBool()); 180 DEFINE_TYPE_CASTS(InterpolableBool, InterpolableValue, value, value->isBool(), v alue.isBool());
181 DEFINE_TYPE_CASTS(InterpolableList, InterpolableValue, value, value->isList(), v alue.isList()); 181 DEFINE_TYPE_CASTS(InterpolableList, InterpolableValue, value, value->isList(), v alue.isList());
182 DEFINE_TYPE_CASTS(InterpolableAnimatableValue, InterpolableValue, value, value-> isAnimatableValue(), value.isAnimatableValue()); 182 DEFINE_TYPE_CASTS(InterpolableAnimatableValue, InterpolableValue, value, value-> isAnimatableValue(), value.isAnimatableValue());
183 183
184 } 184 }
185 185
186 #endif 186 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/IntegerSVGInterpolation.h ('k') | Source/core/animation/InterpolableValueTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698