| Index: Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| index 1337dbf5eb810ec3658209f2ef5e2d081bd06a56..0a6281cffab2e004a2fec82f95c18aab5608734d 100644
|
| --- a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| +++ b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| @@ -26,21 +26,19 @@ PropertyHandleSet AnimatableValueKeyframe::properties() const
|
| return properties;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Keyframe> AnimatableValueKeyframe::clone() const
|
| +Keyframe* AnimatableValueKeyframe::clone() const
|
| {
|
| - return adoptRefWillBeNoop(new AnimatableValueKeyframe(*this));
|
| + return new AnimatableValueKeyframe(*this);
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const
|
| +Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const
|
| {
|
| - return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite()));
|
| + return new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite());
|
| }
|
|
|
| DEFINE_TRACE(AnimatableValueKeyframe)
|
| {
|
| -#if ENABLE(OILPAN)
|
| visitor->trace(m_propertyValues);
|
| -#endif
|
| Keyframe::trace(visitor);
|
| }
|
|
|
| @@ -49,28 +47,27 @@ AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub
|
| , m_value(const_cast<AnimatableValue*>(value))
|
| { }
|
|
|
| -AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue> value)
|
| +AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, AnimatableValue* value)
|
| : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::CompositeReplace)
|
| , m_value(value)
|
| {
|
| ASSERT(!isNull(m_offset));
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
|
| +Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
|
| {
|
| - Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(offset, m_easing, m_value);
|
| - return adoptPtrWillBeNoop(theClone);
|
| + return new PropertySpecificKeyframe(offset, m_easing, m_value);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const
|
| +Interpolation* AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const
|
| {
|
| AnimatableValuePropertySpecificKeyframe& to = toAnimatableValuePropertySpecificKeyframe(end);
|
| return LegacyStyleInterpolation::create(value(), to.value(), property.cssProperty());
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
|
| +Keyframe::PropertySpecificKeyframe* AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
|
| {
|
| - return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd));
|
| + return new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd);
|
| }
|
|
|
| DEFINE_TRACE(AnimatableValueKeyframe::PropertySpecificKeyframe)
|
|
|