| 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/Interpolation.h" | 8 #include "core/animation/Interpolation.h" |
| 9 | 9 |
| 10 namespace WebCore { | 10 namespace WebCore { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 PropertySet properties; | 23 PropertySet 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(*iter.keys()); | 25 properties.add(*iter.keys()); |
| 26 return properties; | 26 return properties; |
| 27 } | 27 } |
| 28 | 28 |
| 29 PassRefPtrWillBeRawPtr<Keyframe> StringKeyframe::clone() const | 29 PassRefPtrWillBeRawPtr<Keyframe> StringKeyframe::clone() const |
| 30 { | 30 { |
| 31 return adoptRefWillBeNoop(new StringKeyframe(*this)); | 31 return adoptRefWillBeNoop(new StringKeyframe(*this)); |
| 32 } | 32 } |
| 33 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpe
cificKeyframe(CSSPropertyID property) const | 33 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::creat
ePropertySpecificKeyframe(CSSPropertyID property) const |
| 34 { | 34 { |
| 35 return adoptPtr(new PropertySpecificKeyframe(offset(), easing(), propertyVal
ue(property), composite())); | 35 return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), easing(), p
ropertyValue(property), composite())); |
| 36 } |
| 37 |
| 38 void StringKeyframe::trace(Visitor* visitor) |
| 39 { |
| 40 Keyframe::trace(visitor); |
| 36 } | 41 } |
| 37 | 42 |
| 38 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, const String& value, AnimationEffect::Compo
siteOperation op) | 43 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, const String& value, AnimationEffect::Compo
siteOperation op) |
| 39 : Keyframe::PropertySpecificKeyframe(offset, easing, op) | 44 : Keyframe::PropertySpecificKeyframe(offset, easing, op) |
| 40 , m_value(value) | 45 , m_value(value) |
| 41 { } | 46 { } |
| 42 | 47 |
| 43 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, const String& value) | 48 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
, PassRefPtr<TimingFunction> easing, const String& value) |
| 44 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos
iteReplace) | 49 : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::Compos
iteReplace) |
| 45 , m_value(value) | 50 , m_value(value) |
| 46 { | 51 { |
| 47 ASSERT(!isNull(m_offset)); | 52 ASSERT(!isNull(m_offset)); |
| 48 } | 53 } |
| 49 | 54 |
| 50 PassRefPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::createInterp
olation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end) const | 55 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::
createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe*
end) const |
| 51 { | 56 { |
| 52 ASSERT_UNUSED(end, end); | 57 ASSERT_UNUSED(end, end); |
| 53 // FIXME: Convert string keyframe value pairs to interpolations. | 58 // FIXME: Convert string keyframe value pairs to interpolations. |
| 54 return nullptr; | 59 return nullptr; |
| 55 } | 60 } |
| 56 | 61 |
| 57 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificK
eyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const | 62 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::Prope
rtySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> e
asing) const |
| 58 { | 63 { |
| 59 return adoptPtr(new StringKeyframe::PropertySpecificKeyframe(offset, easing,
emptyString(), AnimationEffect::CompositeAdd)); | 64 return adoptPtrWillBeNoop(new StringKeyframe::PropertySpecificKeyframe(offse
t, easing, emptyString(), AnimationEffect::CompositeAdd)); |
| 60 } | 65 } |
| 61 | 66 |
| 62 PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificK
eyframe::cloneWithOffset(double offset) const | 67 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::Prope
rtySpecificKeyframe::cloneWithOffset(double offset) const |
| 63 { | 68 { |
| 64 Keyframe::PropertySpecificKeyframe *theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value); | 69 Keyframe::PropertySpecificKeyframe *theClone = new PropertySpecificKeyframe(
offset, m_easing, m_value); |
| 65 return adoptPtr(theClone); | 70 return adoptPtrWillBeNoop(theClone); |
| 71 } |
| 72 |
| 73 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) |
| 74 { |
| 66 } | 75 } |
| 67 | 76 |
| 68 } | 77 } |
| OLD | NEW |