| Index: Source/core/animation/StringKeyframe.cpp
|
| diff --git a/Source/core/animation/StringKeyframe.cpp b/Source/core/animation/StringKeyframe.cpp
|
| index abec9298615fe6f1f083ab3a032b1301a1fb11bc..e3d84df09f7173d10f6d98aeffe20cecce873ad6 100644
|
| --- a/Source/core/animation/StringKeyframe.cpp
|
| +++ b/Source/core/animation/StringKeyframe.cpp
|
| @@ -30,9 +30,14 @@ PassRefPtrWillBeRawPtr<Keyframe> StringKeyframe::clone() const
|
| {
|
| return adoptRefWillBeNoop(new StringKeyframe(*this));
|
| }
|
| -PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpecificKeyframe(CSSPropertyID property) const
|
| +PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpecificKeyframe(CSSPropertyID property) const
|
| {
|
| - return adoptPtr(new PropertySpecificKeyframe(offset(), easing(), propertyValue(property), composite()));
|
| + return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), easing(), propertyValue(property), composite()));
|
| +}
|
| +
|
| +void StringKeyframe::trace(Visitor* visitor)
|
| +{
|
| + Keyframe::trace(visitor);
|
| }
|
|
|
| StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String& value, AnimationEffect::CompositeOperation op)
|
| @@ -47,22 +52,26 @@ StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
|
| ASSERT(!isNull(m_offset));
|
| }
|
|
|
| -PassRefPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end) const
|
| +PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end) const
|
| {
|
| ASSERT_UNUSED(end, end);
|
| // FIXME: Convert string keyframe value pairs to interpolations.
|
| return nullptr;
|
| }
|
|
|
| -PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
|
| +PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
|
| {
|
| - return adoptPtr(new StringKeyframe::PropertySpecificKeyframe(offset, easing, emptyString(), AnimationEffect::CompositeAdd));
|
| + return adoptPtrWillBeNoop(new StringKeyframe::PropertySpecificKeyframe(offset, easing, emptyString(), AnimationEffect::CompositeAdd));
|
| }
|
|
|
| -PassOwnPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
|
| +PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
|
| {
|
| Keyframe::PropertySpecificKeyframe *theClone = new PropertySpecificKeyframe(offset, m_easing, m_value);
|
| - return adoptPtr(theClone);
|
| + return adoptPtrWillBeNoop(theClone);
|
| +}
|
| +
|
| +void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
|
| +{
|
| }
|
|
|
| }
|
|
|