| 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 b2ddfe179c60f006ac817d1b14c76dda5b3af20d..93ed6b8f3b94325391bb6cea47efe85385e91176 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| @@ -42,18 +42,19 @@
|
| #include "core/layout/LayoutObject.h"
|
| #include "core/layout/compositing/CompositedLayerMapping.h"
|
| #include "core/paint/PaintLayer.h"
|
| +#include "platform/CompositorFactory.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| +#include "platform/animation/WebCompositorAnimation.h"
|
| +#include "platform/animation/WebCompositorAnimationPlayer.h"
|
| +#include "platform/animation/WebFilterAnimationCurve.h"
|
| +#include "platform/animation/WebFilterKeyframe.h"
|
| +#include "platform/animation/WebFloatAnimationCurve.h"
|
| +#include "platform/animation/WebFloatKeyframe.h"
|
| +#include "platform/animation/WebTransformAnimationCurve.h"
|
| +#include "platform/animation/WebTransformKeyframe.h"
|
| #include "platform/geometry/FloatBox.h"
|
| #include "public/platform/Platform.h"
|
| -#include "public/platform/WebCompositorAnimation.h"
|
| -#include "public/platform/WebCompositorAnimationPlayer.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| -#include "public/platform/WebFilterAnimationCurve.h"
|
| -#include "public/platform/WebFilterKeyframe.h"
|
| -#include "public/platform/WebFloatAnimationCurve.h"
|
| -#include "public/platform/WebFloatKeyframe.h"
|
| -#include "public/platform/WebTransformAnimationCurve.h"
|
| -#include "public/platform/WebTransformKeyframe.h"
|
|
|
| #include <algorithm>
|
| #include <cmath>
|
| @@ -635,7 +636,7 @@ void CompositorAnimationsImpl::addKeyframesToCurve(WebCompositorAnimationCurve&
|
|
|
| switch (curve.type()) {
|
| case WebCompositorAnimationCurve::AnimationCurveTypeFilter: {
|
| - OwnPtr<WebFilterOperations> ops = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
|
| + OwnPtr<WebFilterOperations> ops = adoptPtr(CompositorFactory::current().createFilterOperations());
|
| toWebFilterOperations(toAnimatableFilterOperations(value)->operations(), ops.get());
|
|
|
| WebFilterKeyframe filterKeyframe(keyframe->offset(), ops.release());
|
| @@ -650,7 +651,7 @@ void CompositorAnimationsImpl::addKeyframesToCurve(WebCompositorAnimationCurve&
|
| break;
|
| }
|
| case WebCompositorAnimationCurve::AnimationCurveTypeTransform: {
|
| - OwnPtr<WebTransformOperations> ops = adoptPtr(Platform::current()->compositorSupport()->createTransformOperations());
|
| + OwnPtr<WebTransformOperations> ops = adoptPtr(CompositorFactory::current().createTransformOperations());
|
| toWebTransformOperations(toAnimatableTransform(value)->transformOperations(), ops.get());
|
|
|
| WebTransformKeyframe transformKeyframe(keyframe->offset(), ops.release());
|
| @@ -683,7 +684,7 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| case CSSPropertyOpacity: {
|
| targetProperty = WebCompositorAnimation::TargetPropertyOpacity;
|
|
|
| - WebFloatAnimationCurve* floatCurve = Platform::current()->compositorSupport()->createFloatAnimationCurve();
|
| + WebFloatAnimationCurve* floatCurve = CompositorFactory::current().createFloatAnimationCurve();
|
| addKeyframesToCurve(*floatCurve, values, timing);
|
| setTimingFunctionOnCurve(*floatCurve, timing.timingFunction.get());
|
| curve = adoptPtr(floatCurve);
|
| @@ -692,7 +693,7 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| case CSSPropertyWebkitFilter:
|
| case CSSPropertyBackdropFilter: {
|
| targetProperty = WebCompositorAnimation::TargetPropertyFilter;
|
| - WebFilterAnimationCurve* filterCurve = Platform::current()->compositorSupport()->createFilterAnimationCurve();
|
| + WebFilterAnimationCurve* filterCurve = CompositorFactory::current().createFilterAnimationCurve();
|
| addKeyframesToCurve(*filterCurve, values, timing);
|
| setTimingFunctionOnCurve(*filterCurve, timing.timingFunction.get());
|
| curve = adoptPtr(filterCurve);
|
| @@ -703,7 +704,7 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| case CSSPropertyTranslate:
|
| case CSSPropertyTransform: {
|
| targetProperty = WebCompositorAnimation::TargetPropertyTransform;
|
| - WebTransformAnimationCurve* transformCurve = Platform::current()->compositorSupport()->createTransformAnimationCurve();
|
| + WebTransformAnimationCurve* transformCurve = CompositorFactory::current().createTransformAnimationCurve();
|
| addKeyframesToCurve(*transformCurve, values, timing);
|
| setTimingFunctionOnCurve(*transformCurve, timing.timingFunction.get());
|
| curve = adoptPtr(transformCurve);
|
| @@ -715,7 +716,7 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
|
| }
|
| ASSERT(curve.get());
|
|
|
| - OwnPtr<WebCompositorAnimation> animation = adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, targetProperty, group, 0));
|
| + OwnPtr<WebCompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*curve, targetProperty, group, 0));
|
|
|
| if (!std::isnan(startTime))
|
| animation->setStartTime(startTime);
|
|
|