Chromium Code Reviews| Index: Source/core/animation/animatable/AnimatableValueKeyframe.cpp |
| diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp |
| index 87172c3c30d9cc0cca6e3ea03cfe44ade4b85154..5dc4cdad4c2db155ecf0a9a136103406fe9371bd 100644 |
| --- a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp |
| +++ b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp |
| @@ -31,9 +31,9 @@ PassRefPtrWillBeRawPtr<Keyframe> AnimatableValueKeyframe::clone() const |
| return adoptRefWillBeNoop(new AnimatableValueKeyframe(*this)); |
| } |
| -PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const |
| +PassRefPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const |
| { |
| - return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite())); |
| + return adoptRefWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property.cssProperty()), composite())); |
| } |
| DEFINE_TRACE(AnimatableValueKeyframe) |
| @@ -56,21 +56,21 @@ AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(doub |
| ASSERT(!isNull(m_offset)); |
| } |
| -PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const |
| +PassRefPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const |
| { |
| Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(offset, m_easing, m_value); |
| - return adoptPtrWillBeNoop(theClone); |
| + return adoptRefWillBeNoop(theClone); |
| } |
| -PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) const |
| +PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(PropertyHandle property, Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle*) |
| { |
| AnimatableValuePropertySpecificKeyframe& to = toAnimatableValuePropertySpecificKeyframe(end); |
| return LegacyStyleInterpolation::create(value(), to.value(), property.cssProperty()); |
| } |
| -PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const |
| +PassRefPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const |
|
shans
2015/06/04 00:15:15
Can you provide a high-level justification of why
alancutter (OOO until 2018)
2015/06/11 04:15:13
Reconsidering this I think there should be no reas
|
| { |
| - return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd)); |
| + return adoptRefWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd)); |
| } |
| DEFINE_TRACE(AnimatableValueKeyframe::PropertySpecificKeyframe) |