| OLD | NEW |
| 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/AnimatableValueKeyframe.h" | 6 #include "core/animation/AnimatableValueKeyframe.h" |
| 7 | 7 |
| 8 #include "core/animation/Interpolation.h" | 8 #include "core/animation/Interpolation.h" |
| 9 #include "core/animation/LegacyStyleInterpolation.h" |
| 9 | 10 |
| 10 namespace WebCore { | 11 namespace WebCore { |
| 11 | 12 |
| 12 AnimatableValueKeyframe::AnimatableValueKeyframe(const AnimatableValueKeyframe&
copyFrom) | 13 AnimatableValueKeyframe::AnimatableValueKeyframe(const AnimatableValueKeyframe&
copyFrom) |
| 13 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing) | 14 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing) |
| 14 { | 15 { |
| 15 for (PropertyValueMap::const_iterator iter = copyFrom.m_propertyValues.begin
(); iter != copyFrom.m_propertyValues.end(); ++iter) | 16 for (PropertyValueMap::const_iterator iter = copyFrom.m_propertyValues.begin
(); iter != copyFrom.m_propertyValues.end(); ++iter) |
| 16 setPropertyValue(iter->key, iter->value.get()); | 17 setPropertyValue(iter->key, iter->value.get()); |
| 17 } | 18 } |
| 18 | 19 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 57 |
| 57 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra
me::PropertySpecificKeyframe::cloneWithOffset(double offset) const | 58 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra
me::PropertySpecificKeyframe::cloneWithOffset(double offset) const |
| 58 { | 59 { |
| 59 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value); | 60 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value); |
| 60 return adoptPtrWillBeNoop(theClone); | 61 return adoptPtrWillBeNoop(theClone); |
| 61 } | 62 } |
| 62 | 63 |
| 63 PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificK
eyframe::createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificK
eyframe* end, Element*) const | 64 PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificK
eyframe::createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificK
eyframe* end, Element*) const |
| 64 { | 65 { |
| 65 AnimatableValuePropertySpecificKeyframe* to = toAnimatableValuePropertySpeci
ficKeyframe(end); | 66 AnimatableValuePropertySpecificKeyframe* to = toAnimatableValuePropertySpeci
ficKeyframe(end); |
| 66 return LegacyStyleInterpolation::create(value(), to->value(), property); | 67 return LegacyStyleInterpolation::create(InterpolableAnimatableValue::create(
value()), InterpolableAnimatableValue::create(to->value()), property); |
| 67 } | 68 } |
| 68 | 69 |
| 69 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra
me::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFu
nction> easing) const | 70 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyfra
me::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFu
nction> easing) const |
| 70 { | 71 { |
| 71 return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyfr
ame(offset, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeA
dd)); | 72 return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyfr
ame(offset, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeA
dd)); |
| 72 } | 73 } |
| 73 | 74 |
| 74 void AnimatableValueKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) | 75 void AnimatableValueKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) |
| 75 { | 76 { |
| 76 visitor->trace(m_value); | 77 visitor->trace(m_value); |
| 77 Keyframe::PropertySpecificKeyframe::trace(visitor); | 78 Keyframe::PropertySpecificKeyframe::trace(visitor); |
| 78 } | 79 } |
| 79 | 80 |
| 80 } | 81 } |
| OLD | NEW |