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

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Resize expect size of Persistent Created 5 years, 7 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 // 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"
11 #include "wtf/OwnPtr.h" 11 #include "wtf/OwnPtr.h"
12 #include "wtf/PassOwnPtr.h" 12 #include "wtf/PassOwnPtr.h"
13 #include "wtf/Vector.h" 13 #include "wtf/Vector.h"
14 14
15 namespace blink { 15 namespace blink {
16 16
17 class CORE_EXPORT InterpolableValue : public NoBaseWillBeGarbageCollected<Interp olableValue> { 17 class CORE_EXPORT InterpolableValue : public GarbageCollected<InterpolableValue> {
18 DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue);
19 public: 18 public:
20 virtual bool isNumber() const { return false; } 19 virtual bool isNumber() const { return false; }
21 virtual bool isBool() const { return false; } 20 virtual bool isBool() const { return false; }
22 virtual bool isList() const { return false; } 21 virtual bool isList() const { return false; }
23 virtual bool isAnimatableValue() const { return false; } 22 virtual bool isAnimatableValue() const { return false; }
24 23
25 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const = 0; 24 virtual InterpolableValue* clone() const = 0;
26 25
27 DEFINE_INLINE_VIRTUAL_TRACE() { } 26 DEFINE_INLINE_VIRTUAL_TRACE() { }
28 27
29 private: 28 private:
30 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const = 0; 29 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const = 0;
31 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst = 0; 30 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst = 0;
32 virtual void multiply(double scalar, InterpolableValue& result) const = 0; 31 virtual void multiply(double scalar, InterpolableValue& result) const = 0;
33 32
34 friend class Interpolation; 33 friend class Interpolation;
35 34
36 // Keep interpolate private, but allow calls within the hierarchy without 35 // Keep interpolate private, but allow calls within the hierarchy without
37 // knowledge of type. 36 // knowledge of type.
38 friend class DeferredLegacyStyleInterpolation; 37 friend class DeferredLegacyStyleInterpolation;
39 friend class InterpolableNumber; 38 friend class InterpolableNumber;
40 friend class InterpolableBool; 39 friend class InterpolableBool;
41 friend class InterpolableList; 40 friend class InterpolableList;
42 41
43 friend class AnimationInterpolableValueTest; 42 friend class AnimationInterpolableValueTest;
44 }; 43 };
45 44
46 class CORE_EXPORT InterpolableNumber final : public InterpolableValue { 45 class CORE_EXPORT InterpolableNumber final : public InterpolableValue {
47 public: 46 public:
48 static PassOwnPtrWillBeRawPtr<InterpolableNumber> create(double value) 47 static InterpolableNumber* create(double value)
49 { 48 {
50 return adoptPtrWillBeNoop(new InterpolableNumber(value)); 49 return new InterpolableNumber(value);
51 } 50 }
52 51
53 virtual bool isNumber() const override final { return true; } 52 virtual bool isNumber() const override final { return true; }
54 double value() const { return m_value; } 53 double value() const { return m_value; }
55 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(m_value); } 54 virtual InterpolableValue* clone() const override final { return create(m_va lue); }
56 55
57 private: 56 private:
58 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; 57 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final;
59 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final; 58 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final;
60 virtual void multiply(double scalar, InterpolableValue& result) const overri de final; 59 virtual void multiply(double scalar, InterpolableValue& result) const overri de final;
61 double m_value; 60 double m_value;
62 61
63 explicit InterpolableNumber(double value) 62 explicit InterpolableNumber(double value)
64 : m_value(value) 63 : m_value(value)
65 { 64 {
66 } 65 }
67 66
68 }; 67 };
69 68
70 class CORE_EXPORT InterpolableBool final : public InterpolableValue { 69 class CORE_EXPORT InterpolableBool final : public InterpolableValue {
71 public: 70 public:
72 static PassOwnPtrWillBeRawPtr<InterpolableBool> create(bool value) 71 static InterpolableBool* create(bool value)
73 { 72 {
74 return adoptPtrWillBeNoop(new InterpolableBool(value)); 73 return new InterpolableBool(value);
75 } 74 }
76 75
77 virtual bool isBool() const override final { return true; } 76 virtual bool isBool() const override final { return true; }
78 bool value() const { return m_value; } 77 bool value() const { return m_value; }
79 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(m_value); } 78 virtual InterpolableValue* clone() const override final { return create(m_va lue); }
80 79
81 private: 80 private:
82 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; 81 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final;
83 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final; 82 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final;
84 virtual void multiply(double scalar, InterpolableValue& result) const overri de final { ASSERT_NOT_REACHED(); } 83 virtual void multiply(double scalar, InterpolableValue& result) const overri de final { ASSERT_NOT_REACHED(); }
85 bool m_value; 84 bool m_value;
86 85
87 explicit InterpolableBool(bool value) 86 explicit InterpolableBool(bool value)
88 : m_value(value) 87 : m_value(value)
89 { 88 {
90 } 89 }
91 90
92 }; 91 };
93 92
94 class CORE_EXPORT InterpolableList : public InterpolableValue { 93 class CORE_EXPORT InterpolableList : public InterpolableValue {
95 public: 94 public:
96 // Explicitly delete operator= because MSVC automatically generate 95 // Explicitly delete operator= because MSVC automatically generate
97 // copy constructors and operator= for dll-exported classes. 96 // copy constructors and operator= for dll-exported classes.
98 // Since InterpolableList is not copyable, automatically generated 97 // Since InterpolableList is not copyable, automatically generated
99 // operator= causes MSVC compiler error. 98 // operator= causes MSVC compiler error.
100 // However, we cannot use WTF_MAKE_NONCOPYABLE because InterpolableList 99 // However, we cannot use WTF_MAKE_NONCOPYABLE because InterpolableList
101 // has its own copy constructor. So just delete operator= here. 100 // has its own copy constructor. So just delete operator= here.
102 InterpolableList& operator=(const InterpolableList&) = delete; 101 InterpolableList& operator=(const InterpolableList&) = delete;
103 102
104 static PassOwnPtrWillBeRawPtr<InterpolableList> create(const InterpolableLis t &other) 103 static InterpolableList* create(const InterpolableList &other)
105 { 104 {
106 return adoptPtrWillBeNoop(new InterpolableList(other)); 105 return new InterpolableList(other);
107 } 106 }
108 107
109 static PassOwnPtrWillBeRawPtr<InterpolableList> create(size_t size) 108 static InterpolableList* create(size_t size)
110 { 109 {
111 return adoptPtrWillBeNoop(new InterpolableList(size)); 110 return new InterpolableList(size);
112 } 111 }
113 112
114 virtual bool isList() const override final { return true; } 113 virtual bool isList() const override final { return true; }
115 void set(size_t position, PassOwnPtrWillBeRawPtr<InterpolableValue> value) 114 void set(size_t position, InterpolableValue* value)
116 { 115 {
117 ASSERT(position < m_size); 116 ASSERT(position < m_size);
118 m_values[position] = value; 117 m_values[position] = value;
119 } 118 }
120 const InterpolableValue* get(size_t position) const 119 const InterpolableValue* get(size_t position) const
121 { 120 {
122 ASSERT(position < m_size); 121 ASSERT(position < m_size);
123 return m_values[position].get(); 122 return m_values[position].get();
124 } 123 }
125 size_t length() const { return m_size; } 124 size_t length() const { return m_size; }
126 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(*this); } 125 virtual InterpolableValue* clone() const override final { return create(*thi s); }
127 126
128 DECLARE_VIRTUAL_TRACE(); 127 DECLARE_VIRTUAL_TRACE();
129 128
130 private: 129 private:
131 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final; 130 virtual void interpolate(const InterpolableValue& to, const double progress, InterpolableValue& result) const override final;
132 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final; 131 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final;
133 virtual void multiply(double scalar, InterpolableValue& result) const overri de final; 132 virtual void multiply(double scalar, InterpolableValue& result) const overri de final;
134 explicit InterpolableList(size_t size) 133 explicit InterpolableList(size_t size)
135 : m_size(size) 134 : m_size(size)
136 , m_values(m_size) 135 , m_values(m_size)
137 { 136 {
138 } 137 }
139 138
140 InterpolableList(const InterpolableList& other) 139 InterpolableList(const InterpolableList& other)
141 : m_size(other.m_size) 140 : m_size(other.m_size)
142 , m_values(m_size) 141 , m_values(m_size)
143 { 142 {
144 for (size_t i = 0; i < m_size; i++) 143 for (size_t i = 0; i < m_size; i++)
145 set(i, other.m_values[i]->clone()); 144 set(i, other.m_values[i]->clone());
146 } 145 }
147 146
148 size_t m_size; 147 size_t m_size;
149 WillBeHeapVector<OwnPtrWillBeMember<InterpolableValue>> m_values; 148 HeapVector<Member<InterpolableValue>> m_values;
150 }; 149 };
151 150
152 // FIXME: Remove this when we can. 151 // FIXME: Remove this when we can.
153 class InterpolableAnimatableValue : public InterpolableValue { 152 class InterpolableAnimatableValue : public InterpolableValue {
154 public: 153 public:
155 static PassOwnPtrWillBeRawPtr<InterpolableAnimatableValue> create(PassRefPtr WillBeRawPtr<AnimatableValue> value) 154 static InterpolableAnimatableValue* create(AnimatableValue* value)
156 { 155 {
157 return adoptPtrWillBeNoop(new InterpolableAnimatableValue(value)); 156 return new InterpolableAnimatableValue(value);
158 } 157 }
159 158
160 virtual bool isAnimatableValue() const override final { return true; } 159 virtual bool isAnimatableValue() const override final { return true; }
161 AnimatableValue* value() const { return m_value.get(); } 160 AnimatableValue* value() const { return m_value.get(); }
162 virtual PassOwnPtrWillBeRawPtr<InterpolableValue> clone() const override fin al { return create(m_value); } 161 virtual InterpolableValue* clone() const override final { return create(m_va lue); }
163 162
164 DECLARE_VIRTUAL_TRACE(); 163 DECLARE_VIRTUAL_TRACE();
165 164
166 private: 165 private:
167 virtual void interpolate(const InterpolableValue &to, const double progress, InterpolableValue& result) const override final; 166 virtual void interpolate(const InterpolableValue &to, const double progress, InterpolableValue& result) const override final;
168 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final { ASSERT_NOT_REACHED(); } 167 virtual void add(const InterpolableValue& rhs, InterpolableValue& result) co nst override final { ASSERT_NOT_REACHED(); }
169 virtual void multiply(double scalar, InterpolableValue& result) const overri de final { ASSERT_NOT_REACHED(); } 168 virtual void multiply(double scalar, InterpolableValue& result) const overri de final { ASSERT_NOT_REACHED(); }
170 RefPtrWillBeMember<AnimatableValue> m_value; 169 Member<AnimatableValue> m_value;
171 170
172 InterpolableAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value) 171 InterpolableAnimatableValue(AnimatableValue* value)
173 : m_value(value) 172 : m_value(value)
174 { 173 {
175 } 174 }
176 }; 175 };
177 176
178 DEFINE_TYPE_CASTS(InterpolableNumber, InterpolableValue, value, value->isNumber( ), value.isNumber()); 177 DEFINE_TYPE_CASTS(InterpolableNumber, InterpolableValue, value, value->isNumber( ), value.isNumber());
179 DEFINE_TYPE_CASTS(InterpolableBool, InterpolableValue, value, value->isBool(), v alue.isBool()); 178 DEFINE_TYPE_CASTS(InterpolableBool, InterpolableValue, value, value->isBool(), v alue.isBool());
180 DEFINE_TYPE_CASTS(InterpolableList, InterpolableValue, value, value->isList(), v alue.isList()); 179 DEFINE_TYPE_CASTS(InterpolableList, InterpolableValue, value, value->isList(), v alue.isList());
181 DEFINE_TYPE_CASTS(InterpolableAnimatableValue, InterpolableValue, value, value-> isAnimatableValue(), value.isAnimatableValue()); 180 DEFINE_TYPE_CASTS(InterpolableAnimatableValue, InterpolableValue, value, value-> isAnimatableValue(), value.isAnimatableValue());
182 181
183 } 182 }
184 183
185 #endif 184 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698