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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/keyframed_animation_curve_unittest.cc

Issue 12517003: cc: Chromify the Animation and LayerAnimationController classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« cc/animation.cc ('K') | « cc/keyframed_animation_curve.cc ('k') | cc/layer.h » ('j') | cc/layer_animation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/keyframed_animation_curve_unittest.cc
diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc
index 2809190281ee121e95a2dbd9907bd61820b77094..f25d4b98b39a3a07cd4d2e6c8dcc581519989144 100644
--- a/cc/keyframed_animation_curve_unittest.cc
+++ b/cc/keyframed_animation_curve_unittest.cc
@@ -13,189 +13,230 @@ namespace {
void expectTranslateX(double translateX, const gfx::Transform& transform)
{
- EXPECT_FLOAT_EQ(translateX, transform.matrix().getDouble(0, 3));
+ EXPECT_FLOAT_EQ(translateX, transform.matrix().getDouble(0, 3));
}
// Tests that a float animation with one keyframe works as expected.
TEST(KeyframedAnimationCurveTest, OneFloatKeyframe)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(0, 2, scoped_ptr<TimingFunction>()));
- EXPECT_FLOAT_EQ(2, curve->getValue(-1));
- EXPECT_FLOAT_EQ(2, curve->getValue(0));
- EXPECT_FLOAT_EQ(2, curve->getValue(0.5));
- EXPECT_FLOAT_EQ(2, curve->getValue(1));
- EXPECT_FLOAT_EQ(2, curve->getValue(2));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(
+ KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(
+ FloatKeyframe::Create(0.0, 2.f, scoped_ptr<TimingFunction>()));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(-1.f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(0.f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(0.5f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(1.f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(2.f));
}
// Tests that a float animation with two keyframes works as expected.
TEST(KeyframedAnimationCurveTest, TwoFloatKeyframe)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(0, 2, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 4, scoped_ptr<TimingFunction>()));
- EXPECT_FLOAT_EQ(2, curve->getValue(-1));
- EXPECT_FLOAT_EQ(2, curve->getValue(0));
- EXPECT_FLOAT_EQ(3, curve->getValue(0.5));
- EXPECT_FLOAT_EQ(4, curve->getValue(1));
- EXPECT_FLOAT_EQ(4, curve->getValue(2));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(
+ KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(
+ FloatKeyframe::Create(0.0, 2.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(1.0, 4.f, scoped_ptr<TimingFunction>()));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(-1.f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(0.f));
+ EXPECT_FLOAT_EQ(3.f, curve->GetValue(0.5f));
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(1.f));
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(2.f));
}
// Tests that a float animation with three keyframes works as expected.
TEST(KeyframedAnimationCurveTest, ThreeFloatKeyframe)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(0, 2, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 4, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(2, 8, scoped_ptr<TimingFunction>()));
- EXPECT_FLOAT_EQ(2, curve->getValue(-1));
- EXPECT_FLOAT_EQ(2, curve->getValue(0));
- EXPECT_FLOAT_EQ(3, curve->getValue(0.5));
- EXPECT_FLOAT_EQ(4, curve->getValue(1));
- EXPECT_FLOAT_EQ(6, curve->getValue(1.5));
- EXPECT_FLOAT_EQ(8, curve->getValue(2));
- EXPECT_FLOAT_EQ(8, curve->getValue(3));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(
+ KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(
+ FloatKeyframe::Create(0.0, 2.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(1.0, 4.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(2.0, 8.f, scoped_ptr<TimingFunction>()));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(-1.f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(0.f));
+ EXPECT_FLOAT_EQ(3.f, curve->GetValue(0.5f));
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(1.f));
+ EXPECT_FLOAT_EQ(6.f, curve->GetValue(1.5f));
+ EXPECT_FLOAT_EQ(8.f, curve->GetValue(2.f));
+ EXPECT_FLOAT_EQ(8.f, curve->GetValue(3.f));
}
// Tests that a float animation with multiple keys at a given time works sanely.
TEST(KeyframedAnimationCurveTest, RepeatedFloatKeyTimes)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(0, 4, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 4, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 6, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(2, 6, scoped_ptr<TimingFunction>()));
-
- EXPECT_FLOAT_EQ(4, curve->getValue(-1));
- EXPECT_FLOAT_EQ(4, curve->getValue(0));
- EXPECT_FLOAT_EQ(4, curve->getValue(0.5));
-
- // There is a discontinuity at 1. Any value between 4 and 6 is valid.
- float value = curve->getValue(1);
- EXPECT_TRUE(value >= 4 && value <= 6);
-
- EXPECT_FLOAT_EQ(6, curve->getValue(1.5));
- EXPECT_FLOAT_EQ(6, curve->getValue(2));
- EXPECT_FLOAT_EQ(6, curve->getValue(3));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(
+ KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(
+ FloatKeyframe::Create(0.0, 4.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(1.0, 4.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(1.0, 6.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(2.0, 6.f, scoped_ptr<TimingFunction>()));
+
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(-1.f));
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(0.f));
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(0.5f));
+
+ // There is a discontinuity at 1. Any value between 4 and 6 is valid.
+ float value = curve->GetValue(1.f);
+ EXPECT_TRUE(value >= 4 && value <= 6);
+
+ EXPECT_FLOAT_EQ(6.f, curve->GetValue(1.5f));
+ EXPECT_FLOAT_EQ(6.f, curve->GetValue(2.f));
+ EXPECT_FLOAT_EQ(6.f, curve->GetValue(3.f));
}
// Tests that a transform animation with one keyframe works as expected.
TEST(KeyframedAnimationCurveTest, OneTransformKeyframe)
{
- scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
- TransformOperations operations;
- operations.AppendTranslate(2, 0, 0);
- curve->addKeyframe(TransformKeyframe::create(0, operations, scoped_ptr<TimingFunction>()));
-
- expectTranslateX(2, curve->getValue(-1));
- expectTranslateX(2, curve->getValue(0));
- expectTranslateX(2, curve->getValue(0.5));
- expectTranslateX(2, curve->getValue(1));
- expectTranslateX(2, curve->getValue(2));
+ scoped_ptr<KeyframedTransformAnimationCurve> curve(
+ KeyframedTransformAnimationCurve::Create());
+ TransformOperations operations;
+ operations.AppendTranslate(2.f, 0.f, 0.f);
+ curve->AddKeyframe(
+ TransformKeyframe::Create(0.f, operations, scoped_ptr<TimingFunction>()));
+
+ expectTranslateX(2.f, curve->GetValue(-1.f));
+ expectTranslateX(2.f, curve->GetValue(0.f));
+ expectTranslateX(2.f, curve->GetValue(0.5f));
+ expectTranslateX(2.f, curve->GetValue(1.f));
+ expectTranslateX(2.f, curve->GetValue(2.f));
}
// Tests that a transform animation with two keyframes works as expected.
TEST(KeyframedAnimationCurveTest, TwoTransformKeyframe)
{
- scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
- TransformOperations operations1;
- operations1.AppendTranslate(2, 0, 0);
- TransformOperations operations2;
- operations2.AppendTranslate(4, 0, 0);
-
- curve->addKeyframe(TransformKeyframe::create(0, operations1, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(TransformKeyframe::create(1, operations2, scoped_ptr<TimingFunction>()));
- expectTranslateX(2, curve->getValue(-1));
- expectTranslateX(2, curve->getValue(0));
- expectTranslateX(3, curve->getValue(0.5));
- expectTranslateX(4, curve->getValue(1));
- expectTranslateX(4, curve->getValue(2));
+ scoped_ptr<KeyframedTransformAnimationCurve> curve(
+ KeyframedTransformAnimationCurve::Create());
+ TransformOperations operations1;
+ operations1.AppendTranslate(2.f, 0.f, 0.f);
+ TransformOperations operations2;
+ operations2.AppendTranslate(4.f, 0.f, 0.f);
+
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 0.f, operations1, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 1.f, operations2, scoped_ptr<TimingFunction>()));
+ expectTranslateX(2.f, curve->GetValue(-1.f));
+ expectTranslateX(2.f, curve->GetValue(0.f));
+ expectTranslateX(3.f, curve->GetValue(0.5f));
+ expectTranslateX(4.f, curve->GetValue(1.f));
+ expectTranslateX(4.f, curve->GetValue(2.f));
}
// Tests that a transform animation with three keyframes works as expected.
TEST(KeyframedAnimationCurveTest, ThreeTransformKeyframe)
{
- scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
- TransformOperations operations1;
- operations1.AppendTranslate(2, 0, 0);
- TransformOperations operations2;
- operations2.AppendTranslate(4, 0, 0);
- TransformOperations operations3;
- operations3.AppendTranslate(8, 0, 0);
- curve->addKeyframe(TransformKeyframe::create(0, operations1, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(TransformKeyframe::create(1, operations2, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(TransformKeyframe::create(2, operations3, scoped_ptr<TimingFunction>()));
- expectTranslateX(2, curve->getValue(-1));
- expectTranslateX(2, curve->getValue(0));
- expectTranslateX(3, curve->getValue(0.5));
- expectTranslateX(4, curve->getValue(1));
- expectTranslateX(6, curve->getValue(1.5));
- expectTranslateX(8, curve->getValue(2));
- expectTranslateX(8, curve->getValue(3));
+ scoped_ptr<KeyframedTransformAnimationCurve> curve(
+ KeyframedTransformAnimationCurve::Create());
+ TransformOperations operations1;
+ operations1.AppendTranslate(2.f, 0.f, 0.f);
+ TransformOperations operations2;
+ operations2.AppendTranslate(4.f, 0.f, 0.f);
+ TransformOperations operations3;
+ operations3.AppendTranslate(8.f, 0.f, 0.f);
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 0.f, operations1, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 1.f, operations2, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 2.f, operations3, scoped_ptr<TimingFunction>()));
+ expectTranslateX(2.f, curve->GetValue(-1.f));
+ expectTranslateX(2.f, curve->GetValue(0.f));
+ expectTranslateX(3.f, curve->GetValue(0.5f));
+ expectTranslateX(4.f, curve->GetValue(1.f));
+ expectTranslateX(6.f, curve->GetValue(1.5f));
+ expectTranslateX(8.f, curve->GetValue(2.f));
+ expectTranslateX(8.f, curve->GetValue(3.f));
}
-// Tests that a transform animation with multiple keys at a given time works sanely.
+// Tests that a transform animation with multiple keys at a given time works
+// sanely.
TEST(KeyframedAnimationCurveTest, RepeatedTransformKeyTimes)
{
- scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
- // A step function.
- TransformOperations operations1;
- operations1.AppendTranslate(4, 0, 0);
- TransformOperations operations2;
- operations2.AppendTranslate(4, 0, 0);
- TransformOperations operations3;
- operations3.AppendTranslate(6, 0, 0);
- TransformOperations operations4;
- operations4.AppendTranslate(6, 0, 0);
- curve->addKeyframe(TransformKeyframe::create(0, operations1, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(TransformKeyframe::create(1, operations2, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(TransformKeyframe::create(1, operations3, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(TransformKeyframe::create(2, operations4, scoped_ptr<TimingFunction>()));
-
- expectTranslateX(4, curve->getValue(-1));
- expectTranslateX(4, curve->getValue(0));
- expectTranslateX(4, curve->getValue(0.5));
-
- // There is a discontinuity at 1. Any value between 4 and 6 is valid.
- gfx::Transform value = curve->getValue(1);
- EXPECT_TRUE(value.matrix().getDouble(0, 3) >= 4 && value.matrix().getDouble(0, 3) <= 6);
-
- expectTranslateX(6, curve->getValue(1.5));
- expectTranslateX(6, curve->getValue(2));
- expectTranslateX(6, curve->getValue(3));
+ scoped_ptr<KeyframedTransformAnimationCurve> curve(
+ KeyframedTransformAnimationCurve::Create());
+ // A step function.
+ TransformOperations operations1;
+ operations1.AppendTranslate(4.f, 0.f, 0.f);
+ TransformOperations operations2;
+ operations2.AppendTranslate(4.f, 0.f, 0.f);
+ TransformOperations operations3;
+ operations3.AppendTranslate(6.f, 0.f, 0.f);
+ TransformOperations operations4;
+ operations4.AppendTranslate(6.f, 0.f, 0.f);
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 0.f, operations1, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 1.f, operations2, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 1.f, operations3, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(TransformKeyframe::Create(
+ 2.f, operations4, scoped_ptr<TimingFunction>()));
+
+ expectTranslateX(4.f, curve->GetValue(-1.f));
+ expectTranslateX(4.f, curve->GetValue(0.f));
+ expectTranslateX(4.f, curve->GetValue(0.5f));
+
+ // There is a discontinuity at 1. Any value between 4 and 6 is valid.
+ gfx::Transform value = curve->GetValue(1.f);
+ EXPECT_TRUE(value.matrix().getDouble(0.f, 3.f) >= 4);
+ EXPECT_TRUE(value.matrix().getDouble(0.f, 3.f) <= 6);
+
+ expectTranslateX(6.f, curve->GetValue(1.5f));
+ expectTranslateX(6.f, curve->GetValue(2.f));
+ expectTranslateX(6.f, curve->GetValue(3.f));
}
// Tests that the keyframes may be added out of order.
TEST(KeyframedAnimationCurveTest, UnsortedKeyframes)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(2, 8, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(0, 2, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 4, scoped_ptr<TimingFunction>()));
- EXPECT_FLOAT_EQ(2, curve->getValue(-1));
- EXPECT_FLOAT_EQ(2, curve->getValue(0));
- EXPECT_FLOAT_EQ(3, curve->getValue(0.5));
- EXPECT_FLOAT_EQ(4, curve->getValue(1));
- EXPECT_FLOAT_EQ(6, curve->getValue(1.5));
- EXPECT_FLOAT_EQ(8, curve->getValue(2));
- EXPECT_FLOAT_EQ(8, curve->getValue(3));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(
+ KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(
+ FloatKeyframe::Create(2.0, 8.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(0.0, 2.f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(1.0, 4.f, scoped_ptr<TimingFunction>()));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(-1.f));
+ EXPECT_FLOAT_EQ(2.f, curve->GetValue(0.f));
+ EXPECT_FLOAT_EQ(3.f, curve->GetValue(0.5f));
+ EXPECT_FLOAT_EQ(4.f, curve->GetValue(1.f));
+ EXPECT_FLOAT_EQ(6.f, curve->GetValue(1.5f));
+ EXPECT_FLOAT_EQ(8.f, curve->GetValue(2.f));
+ EXPECT_FLOAT_EQ(8.f, curve->GetValue(3.f));
}
// Tests that a cubic bezier timing function works as expected.
TEST(KeyframedAnimationCurveTest, CubicBezierTimingFunction)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(0, 0, CubicBezierTimingFunction::create(0.25, 0, 0.75, 1).PassAs<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 1, scoped_ptr<TimingFunction>()));
-
- EXPECT_FLOAT_EQ(0, curve->getValue(0));
- EXPECT_LT(0, curve->getValue(0.25));
- EXPECT_GT(0.25, curve->getValue(0.25));
- EXPECT_NEAR(curve->getValue(0.5), 0.5, 0.00015);
- EXPECT_LT(0.75, curve->getValue(0.75));
- EXPECT_GT(1, curve->getValue(0.75));
- EXPECT_FLOAT_EQ(1, curve->getValue(1));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(
+ KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(
+ FloatKeyframe::Create(
+ 0.f,
+ 0,
+ CubicBezierTimingFunction::create(0.25f, 0.f, 0.75f, 1.f)
+ .PassAs<TimingFunction>()));
+ curve->AddKeyframe(
+ FloatKeyframe::Create(1.0, 1.f, scoped_ptr<TimingFunction>()));
+
+ EXPECT_FLOAT_EQ(0.f, curve->GetValue(0.f));
+ EXPECT_LT(0.f, curve->GetValue(0.25f));
+ EXPECT_GT(0.25f, curve->GetValue(0.25f));
+ EXPECT_NEAR(curve->GetValue(0.5f), 0.5f, 0.00015f);
+ EXPECT_LT(0.75f, curve->GetValue(0.75f));
+ EXPECT_GT(1.f, curve->GetValue(0.75f));
+ EXPECT_FLOAT_EQ(1.f, curve->GetValue(1.f));
}
} // namespace
« cc/animation.cc ('K') | « cc/keyframed_animation_curve.cc ('k') | cc/layer.h » ('j') | cc/layer_animation_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698