| 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/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 { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 PassRefPtr<Keyframe> AnimatableValueKeyframe::clone() const | 29 PassRefPtr<Keyframe> AnimatableValueKeyframe::clone() const |
| 30 { | 30 { |
| 31 return adoptRef(new AnimatableValueKeyframe(*this)); | 31 return adoptRef(new AnimatableValueKeyframe(*this)); |
| 32 } | 32 } |
| 33 | 33 |
| 34 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::createPr
opertySpecificKeyframe(CSSPropertyID property) const | 34 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::createPr
opertySpecificKeyframe(CSSPropertyID property) const |
| 35 { | 35 { |
| 36 return adoptPtr(new PropertySpecificKeyframe(offset(), &easing(), propertyVa
lue(property), composite())); | 36 return adoptPtr(new PropertySpecificKeyframe(offset(), &easing(), propertyVa
lue(property), composite())); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void AnimatableValueKeyframe::trace(Visitor* visitor) | |
| 40 { | |
| 41 #if ENABLE(OILPAN) | |
| 42 visitor->trace(m_propertyValues); | |
| 43 #endif | |
| 44 Keyframe::trace(visitor); | |
| 45 } | |
| 46 | |
| 47 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub
le offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Anim
ationEffect::CompositeOperation op) | 39 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub
le offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Anim
ationEffect::CompositeOperation op) |
| 48 : Keyframe::PropertySpecificKeyframe(offset, easing, op) | 40 : Keyframe::PropertySpecificKeyframe(offset, easing, op) |
| 49 , m_value(const_cast<AnimatableValue*>(value)) | 41 , m_value(const_cast<AnimatableValue*>(value)) |
| 50 { } | 42 { } |
| 51 | 43 |
| 52 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub
le offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue> value) | 44 AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub
le offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue> value) |
| 53 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos
iteReplace) | 45 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos
iteReplace) |
| 54 , m_value(value) | 46 , m_value(value) |
| 55 { | 47 { |
| 56 ASSERT(!isNull(m_offset)); | 48 ASSERT(!isNull(m_offset)); |
| 57 } | 49 } |
| 58 | 50 |
| 59 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::Property
SpecificKeyframe::cloneWithOffset(double offset) const | 51 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::Property
SpecificKeyframe::cloneWithOffset(double offset) const |
| 60 { | 52 { |
| 61 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value); | 53 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value); |
| 62 return adoptPtr(theClone); | 54 return adoptPtr(theClone); |
| 63 } | 55 } |
| 64 | 56 |
| 65 PassRefPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificKeyframe::cre
ateInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end
, Element*) const | 57 PassRefPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificKeyframe::cre
ateInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end
, Element*) const |
| 66 { | 58 { |
| 67 AnimatableValuePropertySpecificKeyframe* to = toAnimatableValuePropertySpeci
ficKeyframe(end); | 59 AnimatableValuePropertySpecificKeyframe* to = toAnimatableValuePropertySpeci
ficKeyframe(end); |
| 68 return LegacyStyleInterpolation::create(value(), to->value(), property); | 60 return LegacyStyleInterpolation::create(value(), to->value(), property); |
| 69 } | 61 } |
| 70 | 62 |
| 71 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::Property
SpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easi
ng) const | 63 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::Property
SpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easi
ng) const |
| 72 { | 64 { |
| 73 return adoptPtr(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset
, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd)); | 65 return adoptPtr(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset
, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd)); |
| 74 } | 66 } |
| 75 | 67 |
| 76 void AnimatableValueKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) | |
| 77 { | |
| 78 visitor->trace(m_value); | |
| 79 Keyframe::PropertySpecificKeyframe::trace(visitor); | |
| 80 } | 68 } |
| 81 | |
| 82 } | |
| OLD | NEW |