Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add WTF_MAKE_NONCOPYABLE. Remove INSIDE_BLINK for keyframes. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/animation/AnimationTranslationUtilTest.cpp ('k') | third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h » ('j') | third_party/WebKit/Source/platform/CompositorFactory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..b399ec5d7b68bea999885f9452a8cc0611569a9b 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/CompositorAnimation.h"
+#include "platform/animation/CompositorAnimationPlayer.h"
+#include "platform/animation/CompositorFilterAnimationCurve.h"
+#include "platform/animation/CompositorFilterKeyframe.h"
+#include "platform/animation/CompositorFloatAnimationCurve.h"
+#include "platform/animation/CompositorFloatKeyframe.h"
+#include "platform/animation/CompositorTransformAnimationCurve.h"
+#include "platform/animation/CompositorTransformKeyframe.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>
@@ -349,13 +350,13 @@ bool CompositorAnimations::startAnimationOnCompositor(const Element& element, in
PaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
ASSERT(layer);
- Vector<OwnPtr<WebCompositorAnimation>> animations;
+ Vector<OwnPtr<CompositorAnimation>> animations;
CompositorAnimationsImpl::getAnimationOnCompositor(timing, group, startTime, timeOffset, keyframeEffect, animations, animationPlaybackRate);
ASSERT(!animations.isEmpty());
for (auto& compositorAnimation : animations) {
int id = compositorAnimation->id();
if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
- WebCompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
+ CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
ASSERT(compositorPlayer);
compositorPlayer->addAnimation(compositorAnimation.leakPtr());
} else if (!layer->compositedLayerMapping()->mainGraphicsLayer()->addAnimation(compositorAnimation.release())) {
@@ -382,7 +383,7 @@ void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, c
return;
}
if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
- WebCompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
+ CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
if (compositorPlayer)
compositorPlayer->removeAnimation(id);
} else {
@@ -401,7 +402,7 @@ void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& e
return;
}
if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
- WebCompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
+ CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
ASSERT(compositorPlayer);
compositorPlayer->pauseAnimation(id, pauseTime);
} else {
@@ -440,7 +441,7 @@ void CompositorAnimations::attachCompositedLayers(const Element& element, const
PaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
ASSERT(layer);
- WebCompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
+ CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
ASSERT(compositorPlayer);
ASSERT(layer->compositedLayerMapping());
@@ -482,7 +483,7 @@ bool CompositorAnimationsImpl::convertTimingForCompositor(const Timing& timing,
namespace {
void getCubicBezierTimingFunctionParameters(const TimingFunction& timingFunction, bool& outCustom,
- WebCompositorAnimationCurve::TimingFunctionType& outEaseSubType,
+ CompositorAnimationCurve::TimingFunctionType& outEaseSubType,
double& outX1, double& outY1, double& outX2, double& outY2)
{
const CubicBezierTimingFunction& cubic = toCubicBezierTimingFunction(timingFunction);
@@ -490,16 +491,16 @@ void getCubicBezierTimingFunctionParameters(const TimingFunction& timingFunction
switch (cubic.subType()) {
case CubicBezierTimingFunction::Ease:
- outEaseSubType = WebCompositorAnimationCurve::TimingFunctionTypeEase;
+ outEaseSubType = CompositorAnimationCurve::TimingFunctionTypeEase;
break;
case CubicBezierTimingFunction::EaseIn:
- outEaseSubType = WebCompositorAnimationCurve::TimingFunctionTypeEaseIn;
+ outEaseSubType = CompositorAnimationCurve::TimingFunctionTypeEaseIn;
break;
case CubicBezierTimingFunction::EaseOut:
- outEaseSubType = WebCompositorAnimationCurve::TimingFunctionTypeEaseOut;
+ outEaseSubType = CompositorAnimationCurve::TimingFunctionTypeEaseOut;
break;
case CubicBezierTimingFunction::EaseInOut:
- outEaseSubType = WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut;
+ outEaseSubType = CompositorAnimationCurve::TimingFunctionTypeEaseInOut;
break;
case CubicBezierTimingFunction::Custom:
outCustom = true;
@@ -545,12 +546,12 @@ void addKeyframeWithTimingFunction(PlatformAnimationCurveType& curve, const Plat
switch (timingFunction->type()) {
case TimingFunction::LinearFunction:
- curve.add(keyframe, WebCompositorAnimationCurve::TimingFunctionTypeLinear);
+ curve.add(keyframe, CompositorAnimationCurve::TimingFunctionTypeLinear);
break;
case TimingFunction::CubicBezierFunction: {
bool custom;
- WebCompositorAnimationCurve::TimingFunctionType easeSubType;
+ CompositorAnimationCurve::TimingFunctionType easeSubType;
double x1, y1;
double x2, y2;
getCubicBezierTimingFunctionParameters(*timingFunction, custom, easeSubType, x1, y1, x2, y2);
@@ -591,7 +592,7 @@ void setTimingFunctionOnCurve(PlatformAnimationCurveType& curve, TimingFunction*
case TimingFunction::CubicBezierFunction: {
bool custom;
- WebCompositorAnimationCurve::TimingFunctionType easeSubType;
+ CompositorAnimationCurve::TimingFunctionType easeSubType;
double x1, y1;
double x2, y2;
getCubicBezierTimingFunctionParameters(*timingFunction, custom, easeSubType, x1, y1, x2, y2);
@@ -619,7 +620,7 @@ void setTimingFunctionOnCurve(PlatformAnimationCurveType& curve, TimingFunction*
} // namespace
-void CompositorAnimationsImpl::addKeyframesToCurve(WebCompositorAnimationCurve& curve, const PropertySpecificKeyframeVector& keyframes, const Timing& timing)
+void CompositorAnimationsImpl::addKeyframesToCurve(CompositorAnimationCurve& curve, const PropertySpecificKeyframeVector& keyframes, const Timing& timing)
{
auto* lastKeyframe = keyframes.last().get();
for (const auto& keyframe : keyframes) {
@@ -634,27 +635,27 @@ void CompositorAnimationsImpl::addKeyframesToCurve(WebCompositorAnimationCurve&
const AnimatableValue* value = keyframe->getAnimatableValue().get();
switch (curve.type()) {
- case WebCompositorAnimationCurve::AnimationCurveTypeFilter: {
- OwnPtr<WebFilterOperations> ops = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
- toWebFilterOperations(toAnimatableFilterOperations(value)->operations(), ops.get());
+ case CompositorAnimationCurve::AnimationCurveTypeFilter: {
+ OwnPtr<CompositorFilterOperations> ops = adoptPtr(CompositorFactory::current().createFilterOperations());
+ toCompositorFilterOperations(toAnimatableFilterOperations(value)->operations(), ops.get());
- WebFilterKeyframe filterKeyframe(keyframe->offset(), ops.release());
- WebFilterAnimationCurve* filterCurve = static_cast<WebFilterAnimationCurve*>(&curve);
+ CompositorFilterKeyframe filterKeyframe(keyframe->offset(), ops.release());
+ CompositorFilterAnimationCurve* filterCurve = static_cast<CompositorFilterAnimationCurve*>(&curve);
addKeyframeWithTimingFunction(*filterCurve, filterKeyframe, keyframeTimingFunction);
break;
}
- case WebCompositorAnimationCurve::AnimationCurveTypeFloat: {
- WebFloatKeyframe floatKeyframe(keyframe->offset(), toAnimatableDouble(value)->toDouble());
- WebFloatAnimationCurve* floatCurve = static_cast<WebFloatAnimationCurve*>(&curve);
+ case CompositorAnimationCurve::AnimationCurveTypeFloat: {
+ CompositorFloatKeyframe floatKeyframe(keyframe->offset(), toAnimatableDouble(value)->toDouble());
+ CompositorFloatAnimationCurve* floatCurve = static_cast<CompositorFloatAnimationCurve*>(&curve);
addKeyframeWithTimingFunction(*floatCurve, floatKeyframe, keyframeTimingFunction);
break;
}
- case WebCompositorAnimationCurve::AnimationCurveTypeTransform: {
- OwnPtr<WebTransformOperations> ops = adoptPtr(Platform::current()->compositorSupport()->createTransformOperations());
- toWebTransformOperations(toAnimatableTransform(value)->transformOperations(), ops.get());
+ case CompositorAnimationCurve::AnimationCurveTypeTransform: {
+ OwnPtr<CompositorTransformOperations> ops = adoptPtr(CompositorFactory::current().createTransformOperations());
+ toCompositorTransformOperations(toAnimatableTransform(value)->transformOperations(), ops.get());
- WebTransformKeyframe transformKeyframe(keyframe->offset(), ops.release());
- WebTransformAnimationCurve* transformCurve = static_cast<WebTransformAnimationCurve*>(&curve);
+ CompositorTransformKeyframe transformKeyframe(keyframe->offset(), ops.release());
+ CompositorTransformAnimationCurve* transformCurve = static_cast<CompositorTransformAnimationCurve*>(&curve);
addKeyframeWithTimingFunction(*transformCurve, transformKeyframe, keyframeTimingFunction);
break;
}
@@ -664,7 +665,7 @@ void CompositorAnimationsImpl::addKeyframesToCurve(WebCompositorAnimationCurve&
}
}
-void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, int group, double startTime, double timeOffset, const KeyframeEffectModelBase& effect, Vector<OwnPtr<WebCompositorAnimation>>& animations, double animationPlaybackRate)
+void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, int group, double startTime, double timeOffset, const KeyframeEffectModelBase& effect, Vector<OwnPtr<CompositorAnimation>>& animations, double animationPlaybackRate)
{
ASSERT(animations.isEmpty());
CompositorTiming compositorTiming;
@@ -677,13 +678,13 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
PropertySpecificKeyframeVector values;
getKeyframeValuesForProperty(&effect, property, compositorTiming.scaledDuration, values);
- WebCompositorAnimation::TargetProperty targetProperty;
- OwnPtr<WebCompositorAnimationCurve> curve;
+ CompositorAnimation::TargetProperty targetProperty;
+ OwnPtr<CompositorAnimationCurve> curve;
switch (property.cssProperty()) {
case CSSPropertyOpacity: {
- targetProperty = WebCompositorAnimation::TargetPropertyOpacity;
+ targetProperty = CompositorAnimation::TargetPropertyOpacity;
- WebFloatAnimationCurve* floatCurve = Platform::current()->compositorSupport()->createFloatAnimationCurve();
+ CompositorFloatAnimationCurve* floatCurve = CompositorFactory::current().createFloatAnimationCurve();
addKeyframesToCurve(*floatCurve, values, timing);
setTimingFunctionOnCurve(*floatCurve, timing.timingFunction.get());
curve = adoptPtr(floatCurve);
@@ -691,8 +692,8 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
}
case CSSPropertyWebkitFilter:
case CSSPropertyBackdropFilter: {
- targetProperty = WebCompositorAnimation::TargetPropertyFilter;
- WebFilterAnimationCurve* filterCurve = Platform::current()->compositorSupport()->createFilterAnimationCurve();
+ targetProperty = CompositorAnimation::TargetPropertyFilter;
+ CompositorFilterAnimationCurve* filterCurve = CompositorFactory::current().createFilterAnimationCurve();
addKeyframesToCurve(*filterCurve, values, timing);
setTimingFunctionOnCurve(*filterCurve, timing.timingFunction.get());
curve = adoptPtr(filterCurve);
@@ -702,8 +703,8 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
case CSSPropertyScale:
case CSSPropertyTranslate:
case CSSPropertyTransform: {
- targetProperty = WebCompositorAnimation::TargetPropertyTransform;
- WebTransformAnimationCurve* transformCurve = Platform::current()->compositorSupport()->createTransformAnimationCurve();
+ targetProperty = CompositorAnimation::TargetPropertyTransform;
+ CompositorTransformAnimationCurve* 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<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*curve, targetProperty, group, 0));
if (!std::isnan(startTime))
animation->setStartTime(startTime);
@@ -726,16 +727,16 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
switch (compositorTiming.direction) {
case Timing::PlaybackDirectionNormal:
- animation->setDirection(WebCompositorAnimation::DirectionNormal);
+ animation->setDirection(CompositorAnimation::DirectionNormal);
break;
case Timing::PlaybackDirectionReverse:
- animation->setDirection(WebCompositorAnimation::DirectionReverse);
+ animation->setDirection(CompositorAnimation::DirectionReverse);
break;
case Timing::PlaybackDirectionAlternate:
- animation->setDirection(WebCompositorAnimation::DirectionAlternate);
+ animation->setDirection(CompositorAnimation::DirectionAlternate);
break;
case Timing::PlaybackDirectionAlternateReverse:
- animation->setDirection(WebCompositorAnimation::DirectionAlternateReverse);
+ animation->setDirection(CompositorAnimation::DirectionAlternateReverse);
break;
default:
ASSERT_NOT_REACHED();
@@ -744,16 +745,16 @@ void CompositorAnimationsImpl::getAnimationOnCompositor(const Timing& timing, in
switch (compositorTiming.fillMode) {
case Timing::FillModeNone:
- animation->setFillMode(WebCompositorAnimation::FillModeNone);
+ animation->setFillMode(CompositorAnimation::FillModeNone);
break;
case Timing::FillModeForwards:
- animation->setFillMode(WebCompositorAnimation::FillModeForwards);
+ animation->setFillMode(CompositorAnimation::FillModeForwards);
break;
case Timing::FillModeBackwards:
- animation->setFillMode(WebCompositorAnimation::FillModeBackwards);
+ animation->setFillMode(CompositorAnimation::FillModeBackwards);
break;
case Timing::FillModeBoth:
- animation->setFillMode(WebCompositorAnimation::FillModeBoth);
+ animation->setFillMode(CompositorAnimation::FillModeBoth);
break;
default:
ASSERT_NOT_REACHED();
« no previous file with comments | « third_party/WebKit/Source/core/animation/AnimationTranslationUtilTest.cpp ('k') | third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h » ('j') | third_party/WebKit/Source/platform/CompositorFactory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698