| 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/StringKeyframe.h" | 6 #include "core/animation/StringKeyframe.h" |
| 7 | 7 |
| 8 #include "core/animation/DefaultStyleInterpolation.h" | 8 #include "core/animation/DefaultStyleInterpolation.h" |
| 9 #include "core/animation/DeferredLegacyStyleInterpolation.h" | 9 #include "core/animation/DeferredLegacyStyleInterpolation.h" |
| 10 #include "core/animation/LegacyStyleInterpolation.h" | 10 #include "core/animation/LegacyStyleInterpolation.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 PassRefPtr<Keyframe> StringKeyframe::clone() const | 42 PassRefPtr<Keyframe> StringKeyframe::clone() const |
| 43 { | 43 { |
| 44 return adoptRef(new StringKeyframe(*this)); | 44 return adoptRef(new StringKeyframe(*this)); |
| 45 } | 45 } |
| 46 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpe
cificKeyframe(CSSPropertyID property) const | 46 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpe
cificKeyframe(CSSPropertyID property) const |
| 47 { | 47 { |
| 48 return adoptPtr(new PropertySpecificKeyframe(offset(), &easing(), propertyVa
lue(property), composite())); | 48 return adoptPtr(new PropertySpecificKeyframe(offset(), &easing(), propertyVa
lue(property), composite())); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void StringKeyframe::trace(Visitor* visitor) | |
| 52 { | |
| 53 visitor->trace(m_propertySet); | |
| 54 Keyframe::trace(visitor); | |
| 55 } | |
| 56 | |
| 57 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, CSSValue* value, AnimationEffect::Composite
Operation op) | 51 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, CSSValue* value, AnimationEffect::Composite
Operation op) |
| 58 : Keyframe::PropertySpecificKeyframe(offset, easing, op) | 52 : Keyframe::PropertySpecificKeyframe(offset, easing, op) |
| 59 , m_value(value) | 53 , m_value(value) |
| 60 { } | 54 { } |
| 61 | 55 |
| 62 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, CSSValue* value) | 56 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, CSSValue* value) |
| 63 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos
iteReplace) | 57 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos
iteReplace) |
| 64 , m_value(value) | 58 , m_value(value) |
| 65 { | 59 { |
| 66 ASSERT(!isNull(m_offset)); | 60 ASSERT(!isNull(m_offset)); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 return adoptPtr(new PropertySpecificKeyframe(offset, easing, 0, AnimationEff
ect::CompositeAdd)); | 129 return adoptPtr(new PropertySpecificKeyframe(offset, easing, 0, AnimationEff
ect::CompositeAdd)); |
| 136 } | 130 } |
| 137 | 131 |
| 138 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificK
eyframe::cloneWithOffset(double offset) const | 132 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificK
eyframe::cloneWithOffset(double offset) const |
| 139 { | 133 { |
| 140 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value.get()); | 134 Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value.get()); |
| 141 toStringPropertySpecificKeyframe(theClone)->m_animatableValueCache = m_anima
tableValueCache; | 135 toStringPropertySpecificKeyframe(theClone)->m_animatableValueCache = m_anima
tableValueCache; |
| 142 return adoptPtr(theClone); | 136 return adoptPtr(theClone); |
| 143 } | 137 } |
| 144 | 138 |
| 145 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) | |
| 146 { | |
| 147 visitor->trace(m_value); | |
| 148 visitor->trace(m_animatableValueCache); | |
| 149 Keyframe::PropertySpecificKeyframe::trace(visitor); | |
| 150 } | 139 } |
| 151 | |
| 152 } | |
| OLD | NEW |