| Index: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| index 41a8acf76e65d74a60f0a7e7960c6c6a6f277615..4135979fae51a4e28b86006fd03fa437061a6787 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| @@ -636,7 +636,7 @@ void CompositorAnimationsImpl::addKeyframesToCurve(CompositorAnimationCurve& cur
|
|
|
| switch (curve.type()) {
|
| case CompositorAnimationCurve::AnimationCurveTypeFilter: {
|
| - OwnPtr<CompositorFilterOperations> ops = adoptPtr(CompositorFactory::current().createFilterOperations());
|
| + OwnPtr<CompositorFilterOperations> ops = CompositorFactory::current().createFilterOperations();
|
| toCompositorFilterOperations(toAnimatableFilterOperations(value)->operations(), ops.get());
|
|
|
| CompositorFilterKeyframe filterKeyframe(keyframe->offset(), ops.release());
|
| @@ -651,7 +651,7 @@ void CompositorAnimationsImpl::addKeyframesToCurve(CompositorAnimationCurve& cur
|
| break;
|
| }
|
| case CompositorAnimationCurve::AnimationCurveTypeTransform: {
|
| - OwnPtr<CompositorTransformOperations> ops = adoptPtr(CompositorFactory::current().createTransformOperations());
|
| + OwnPtr<CompositorTransformOperations> ops = CompositorFactory::current().createTransformOperations();
|
| toCompositorTransformOperations(toAnimatableTransform(value)->transformOperations(), ops.get());
|
|
|
| CompositorTransformKeyframe transformKeyframe(keyframe->offset(), ops.release());
|
| @@ -684,19 +684,19 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| case CSSPropertyOpacity: {
|
| targetProperty = CompositorAnimation::TargetPropertyOpacity;
|
|
|
| - CompositorFloatAnimationCurve* floatCurve = CompositorFactory::current().createFloatAnimationCurve();
|
| + OwnPtr<CompositorFloatAnimationCurve> floatCurve = CompositorFactory::current().createFloatAnimationCurve();
|
| addKeyframesToCurve(*floatCurve, values, timing);
|
| setTimingFunctionOnCurve(*floatCurve, timing.timingFunction.get());
|
| - curve = adoptPtr(floatCurve);
|
| + curve = floatCurve.release();
|
| break;
|
| }
|
| case CSSPropertyWebkitFilter:
|
| case CSSPropertyBackdropFilter: {
|
| targetProperty = CompositorAnimation::TargetPropertyFilter;
|
| - CompositorFilterAnimationCurve* filterCurve = CompositorFactory::current().createFilterAnimationCurve();
|
| + OwnPtr<CompositorFilterAnimationCurve> filterCurve = CompositorFactory::current().createFilterAnimationCurve();
|
| addKeyframesToCurve(*filterCurve, values, timing);
|
| setTimingFunctionOnCurve(*filterCurve, timing.timingFunction.get());
|
| - curve = adoptPtr(filterCurve);
|
| + curve = filterCurve.release();
|
| break;
|
| }
|
| case CSSPropertyRotate:
|
| @@ -704,10 +704,10 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| case CSSPropertyTranslate:
|
| case CSSPropertyTransform: {
|
| targetProperty = CompositorAnimation::TargetPropertyTransform;
|
| - CompositorTransformAnimationCurve* transformCurve = CompositorFactory::current().createTransformAnimationCurve();
|
| + OwnPtr<CompositorTransformAnimationCurve> transformCurve = CompositorFactory::current().createTransformAnimationCurve();
|
| addKeyframesToCurve(*transformCurve, values, timing);
|
| setTimingFunctionOnCurve(*transformCurve, timing.timingFunction.get());
|
| - curve = adoptPtr(transformCurve);
|
| + curve = transformCurve.release();
|
| break;
|
| }
|
| default:
|
| @@ -716,7 +716,7 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| }
|
| ASSERT(curve.get());
|
|
|
| - OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*curve, targetProperty, group, 0));
|
| + OwnPtr<CompositorAnimation> animation = CompositorFactory::current().createAnimation(*curve, targetProperty, group, 0);
|
|
|
| if (!std::isnan(startTime))
|
| animation->setStartTime(startTime);
|
|
|