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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/animation/CompositorAnimationsTest.cpp

Issue 412123002: Rename WebAnimation to WebCompositorAnimation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Set upstream branch Created 6 years, 5 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 | « Source/core/animation/CompositorAnimationsImpl.h ('k') | Source/core/animation/CompositorAnimationsTestHelper.h » ('j') | public/platform/WebCompositorAnimation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/CompositorAnimationsTest.cpp
diff --git a/Source/core/animation/CompositorAnimationsTest.cpp b/Source/core/animation/CompositorAnimationsTest.cpp
index b6470f01e982688478c6c44b382a34400d17656f..feb388e33d088d49a301bfecdb5a0bf04c6ef5b2 100644
--- a/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/Source/core/animation/CompositorAnimationsTest.cpp
@@ -43,7 +43,7 @@
#include "platform/graphics/filters/FilterOperations.h"
#include "platform/transforms/TransformOperations.h"
#include "platform/transforms/TranslateTransformOperation.h"
-#include "public/platform/WebAnimation.h"
+#include "public/platform/WebCompositorAnimation.h"
#include "wtf/HashFunctions.h"
#include "wtf/OwnPtr.h"
#include "wtf/PassOwnPtr.h"
@@ -107,7 +107,7 @@ public:
{
return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(timing, effect);
}
- void getAnimationOnCompositor(Timing& timing, AnimatableValueKeyframeEffectModel& effect, Vector<OwnPtr<blink::WebAnimation> >& animations)
+ void getAnimationOnCompositor(Timing& timing, AnimatableValueKeyframeEffectModel& effect, Vector<OwnPtr<blink::WebCompositorAnimation> >& animations)
{
return CompositorAnimationsImpl::getAnimationOnCompositor(timing, std::numeric_limits<double>::quiet_NaN(), effect, animations);
}
@@ -589,14 +589,14 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimation)
EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
.WillOnce(Return(mockCurvePtr));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 5.0)));
// Create animation
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
@@ -612,7 +612,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimation)
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
@@ -636,14 +636,14 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationDuration)
EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
.WillOnce(Return(mockCurvePtr));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(10.0, 5.0)));
// Create animation
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
@@ -659,7 +659,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationDuration)
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
@@ -687,16 +687,16 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation
EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
.WillOnce(Return(mockCurvePtr));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.25, -1.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5, 20.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.25, -1.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5, 20.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 5.0)));
// Animation is created
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
@@ -712,7 +712,7 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
@@ -738,14 +738,14 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationStartDelay
EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
.WillOnce(Return(mockCurvePtr));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.75, 5.0)));
// Create animation
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
@@ -761,7 +761,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationStartDelay
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
@@ -795,16 +795,16 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation
EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
.WillOnce(Return(mockCurvePtr));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeEase));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5, -1.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeEase));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5, -1.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 20.0), 1.0, 2.0, 3.0, 4.0));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(2.0, 5.0)));
// Animation is created
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));
@@ -820,7 +820,7 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
@@ -856,15 +856,15 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimation)
.WillOnce(Return(mockCurvePtr));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 5.0), 1.0, 0.0, 1.0, 1.0));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5, 20.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.75, -1.0), blink::WebAnimationCurve::TimingFunctionTypeEaseOut));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5, 20.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.75, -1.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeEaseOut));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 2.0)));
// Create the animation
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));
@@ -880,7 +880,7 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimation)
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
@@ -907,14 +907,14 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimationNegative
EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
.WillOnce(Return(mockCurvePtr));
- usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 5.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+ usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 5.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear));
usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.5, 2.0)));
// Create animation
- blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
+ blink::WebCompositorAnimationMock* mockAnimationPtr = new blink::WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetPropertyOpacity);
ExpectationSet usesMockAnimation;
- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebCompositorAnimation::TargetPropertyOpacity, _))
.WillOnce(Return(mockAnimationPtr));
usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
@@ -930,7 +930,7 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimationNegative
// Go!
setCompositorForTesting(mockCompositor);
- Vector<OwnPtr<blink::WebAnimation> > result;
+ Vector<OwnPtr<blink::WebCompositorAnimation> > result;
getAnimationOnCompositor(m_timing, *effect.get(), result);
EXPECT_EQ(1U, result.size());
result[0].clear();
« no previous file with comments | « Source/core/animation/CompositorAnimationsImpl.h ('k') | Source/core/animation/CompositorAnimationsTestHelper.h » ('j') | public/platform/WebCompositorAnimation.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698