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 "core/animation/animatable/AnimatableValueKeyframe.h" | 5 #include "core/animation/animatable/AnimatableValueKeyframe.h" |
6 | 6 |
7 #include "core/animation/LegacyStyleInterpolation.h" | 7 #include "core/animation/LegacyStyleInterpolation.h" |
8 #include "core/animation/TransitionKeyframe.h" | |
Eric Willigers
2017/02/09 04:58:30
Needed ?
alancutter (OOO until 2018)
2017/02/16 04:01:43
Removed.
| |
8 | 9 |
9 namespace blink { | 10 namespace blink { |
10 | 11 |
11 AnimatableValueKeyframe::AnimatableValueKeyframe( | 12 AnimatableValueKeyframe::AnimatableValueKeyframe( |
12 const AnimatableValueKeyframe& copyFrom) | 13 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 for (PropertyValueMap::const_iterator iter = | 15 for (PropertyValueMap::const_iterator iter = |
15 copyFrom.m_propertyValues.begin(); | 16 copyFrom.m_propertyValues.begin(); |
16 iter != copyFrom.m_propertyValues.end(); ++iter) | 17 iter != copyFrom.m_propertyValues.end(); ++iter) |
17 setPropertyValue(iter->key, iter->value.get()); | 18 setPropertyValue(iter->key, iter->value.get()); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
55 | 56 |
56 PassRefPtr<Keyframe::PropertySpecificKeyframe> | 57 PassRefPtr<Keyframe::PropertySpecificKeyframe> |
57 AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe( | 58 AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe( |
58 double offset, | 59 double offset, |
59 PassRefPtr<TimingFunction> easing) const { | 60 PassRefPtr<TimingFunction> easing) const { |
60 return create(offset, std::move(easing), AnimatableValue::neutralValue(), | 61 return create(offset, std::move(easing), AnimatableValue::neutralValue(), |
61 EffectModel::CompositeAdd); | 62 EffectModel::CompositeAdd); |
62 } | 63 } |
63 | 64 |
64 } // namespace blink | 65 } // namespace blink |
OLD | NEW |