| Index: third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h b/third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h
|
| index 7320bb91669a92bab951564f5934d4b319c92f3c..fb751bb95e559a489c91985e9740c222d792ed3e 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsImpl.h
|
| @@ -35,13 +35,13 @@
|
| #include "core/animation/EffectModel.h"
|
| #include "core/animation/KeyframeEffectModel.h"
|
| #include "core/animation/Timing.h"
|
| +#include "platform/animation/CompositorAnimation.h"
|
| #include "platform/animation/TimingFunction.h"
|
| -#include "public/platform/WebCompositorAnimation.h"
|
| #include "wtf/Allocator.h"
|
|
|
| namespace blink {
|
|
|
| -class WebCompositorAnimationCurve;
|
| +class CompositorAnimationCurve;
|
|
|
| class CORE_EXPORT CompositorAnimationsImpl {
|
| STATIC_ONLY(CompositorAnimationsImpl);
|
| @@ -68,9 +68,9 @@ private:
|
|
|
| static bool convertTimingForCompositor(const Timing&, double timeOffset, CompositorTiming& out, double animationPlaybackRate);
|
|
|
| - static void getAnimationOnCompositor(const Timing&, int group, double startTime, double timeOffset, const KeyframeEffectModelBase&, Vector<OwnPtr<WebCompositorAnimation>>& animations, double animationPlaybackRate);
|
| + static void getAnimationOnCompositor(const Timing&, int group, double startTime, double timeOffset, const KeyframeEffectModelBase&, Vector<OwnPtr<CompositorAnimation>>& animations, double animationPlaybackRate);
|
|
|
| - static void addKeyframesToCurve(WebCompositorAnimationCurve&, const AnimatableValuePropertySpecificKeyframeVector&, const Timing&);
|
| + static void addKeyframesToCurve(CompositorAnimationCurve&, const AnimatableValuePropertySpecificKeyframeVector&, const Timing&);
|
|
|
| friend class CompositorAnimations;
|
| friend class AnimationCompositorAnimationsTest;
|
|
|