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

Side by Side Diff: Source/core/animation/animatable/AnimatableValueKeyframe.cpp

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: Rebase Created 5 years, 4 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 #include "config.h" 5 #include "config.h"
6 #include "core/animation/animatable/AnimatableValueKeyframe.h" 6 #include "core/animation/animatable/AnimatableValueKeyframe.h"
7 7
8 #include "core/animation/LegacyStyleInterpolation.h" 8 #include "core/animation/LegacyStyleInterpolation.h"
9 9
10 namespace blink { 10 namespace blink {
11 11
12 AnimatableValueKeyframe::AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom) 12 AnimatableValueKeyframe::AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom)
13 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing) 13 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing)
14 { 14 {
15 for (PropertyValueMap::const_iterator iter = copyFrom.m_propertyValues.begin (); iter != copyFrom.m_propertyValues.end(); ++iter) 15 for (PropertyValueMap::const_iterator iter = copyFrom.m_propertyValues.begin (); iter != copyFrom.m_propertyValues.end(); ++iter)
16 setPropertyValue(iter->key, iter->value.get()); 16 setPropertyValue(iter->key, iter->value.get());
17 } 17 }
18 18
19 PropertyHandleSet AnimatableValueKeyframe::properties() const 19 PropertyHandleSet AnimatableValueKeyframe::properties() const
20 { 20 {
21 // This is not used in time-critical code, so we probably don't need to 21 // This is not used in time-critical code, so we probably don't need to
22 // worry about caching this result. 22 // worry about caching this result.
23 PropertyHandleSet properties; 23 PropertyHandleSet properties;
24 for (PropertyValueMap::const_iterator iter = m_propertyValues.begin(); iter != m_propertyValues.end(); ++iter) 24 for (PropertyValueMap::const_iterator iter = m_propertyValues.begin(); iter != m_propertyValues.end(); ++iter)
25 properties.add(PropertyHandle(*iter.keys())); 25 properties.add(PropertyHandle(*iter.keys()));
26 return properties; 26 return properties;
27 } 27 }
28 28
29 PassRefPtrWillBeRawPtr<Keyframe> AnimatableValueKeyframe::clone() const 29 Keyframe* AnimatableValueKeyframe::clone() const
30 { 30 {
31 return adoptRefWillBeNoop(new AnimatableValueKeyframe(*this)); 31 return new AnimatableValueKeyframe(*this);
32 } 32 }
33 33
34 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra me::createPropertySpecificKeyframe(PropertyHandle property) const 34 Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::createPropertySpeci ficKeyframe(PropertyHandle property) const
35 { 35 {
36 return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite())); 36 return new PropertySpecificKeyframe(offset(), &easing(), propertyValue(prope rty.cssProperty()), composite());
37 } 37 }
38 38
39 DEFINE_TRACE(AnimatableValueKeyframe) 39 DEFINE_TRACE(AnimatableValueKeyframe)
40 { 40 {
41 #if ENABLE(OILPAN)
42 visitor->trace(m_propertyValues); 41 visitor->trace(m_propertyValues);
43 #endif
44 Keyframe::trace(visitor); 42 Keyframe::trace(visitor);
45 } 43 }
46 44
47 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub le offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Effe ctModel::CompositeOperation op) 45 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub le offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Effe ctModel::CompositeOperation op)
48 : Keyframe::PropertySpecificKeyframe(offset, easing, op) 46 : Keyframe::PropertySpecificKeyframe(offset, easing, op)
49 , m_value(const_cast<AnimatableValue*>(value)) 47 , m_value(const_cast<AnimatableValue*>(value))
50 { } 48 { }
51 49
52 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub le offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableV alue> value) 50 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub le offset, PassRefPtr<TimingFunction> easing, AnimatableValue* value)
53 : Keyframe::PropertySpecificKeyframe(offset, easing, EffectModel::CompositeR eplace) 51 : Keyframe::PropertySpecificKeyframe(offset, easing, EffectModel::CompositeR eplace)
54 , m_value(value) 52 , m_value(value)
55 { 53 {
56 ASSERT(!isNull(m_offset)); 54 ASSERT(!isNull(m_offset));
57 } 55 }
58 56
59 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra me::PropertySpecificKeyframe::cloneWithOffset(double offset) const 57 Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::PropertySpecificKey frame::cloneWithOffset(double offset) const
60 { 58 {
61 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe( offset, m_easing, m_value); 59 return new PropertySpecificKeyframe(offset, m_easing, m_value);
62 return adoptPtrWillBeNoop(theClone);
63 } 60 }
64 61
65 PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificK eyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpe cificKeyframe& end, Element*, const ComputedStyle*) const 62 Interpolation* AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInt erpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Ele ment*, const ComputedStyle*) const
66 { 63 {
67 AnimatableValuePropertySpecificKeyframe& to = toAnimatableValuePropertySpeci ficKeyframe(end); 64 AnimatableValuePropertySpecificKeyframe& to = toAnimatableValuePropertySpeci ficKeyframe(end);
68 return LegacyStyleInterpolation::create(value(), to.value(), property.cssPro perty()); 65 return LegacyStyleInterpolation::create(value(), to.value(), property.cssPro perty());
69 } 66 }
70 67
71 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra me::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFu nction> easing) const 68 Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::PropertySpecificKey frame::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
72 { 69 {
73 return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyfr ame(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd)) ; 70 return new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd);
74 } 71 }
75 72
76 DEFINE_TRACE(AnimatableValueKeyframe::PropertySpecificKeyframe) 73 DEFINE_TRACE(AnimatableValueKeyframe::PropertySpecificKeyframe)
77 { 74 {
78 visitor->trace(m_value); 75 visitor->trace(m_value);
79 Keyframe::PropertySpecificKeyframe::trace(visitor); 76 Keyframe::PropertySpecificKeyframe::trace(visitor);
80 } 77 }
81 78
82 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698