Animation start scale should be considered for the raster scale

cc/animation/layer_animation_controller_unittest.cc

Index: cc/animation/layer_animation_controller_unittest.cc
diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc
index 48e9e926a1d19365c8b4fbee31b8f76bc93610ff..33896e6f367c70e9b5e9210380e924f569f2d132 100644
--- a/cc/animation/layer_animation_controller_unittest.cc
+++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -1922,6 +1922,70 @@ TEST(LayerAnimationControllerTest, HasOnlyTranslationTransforms) {
   EXPECT_TRUE(controller_impl->HasOnlyTranslationTransforms());
 }
 
+TEST(LayerAnimationControllerTest, AnimationStartScale) {
+  scoped_refptr<LayerAnimationController> controller_impl(
+      LayerAnimationController::Create(0));
+  scoped_ptr<KeyframedTransformAnimationCurve> curve1(
+      KeyframedTransformAnimationCurve::Create());
+
+  TransformOperations operations1;
+  operations1.AppendScale(2.0, 3.0, 4.0);
+  curve1->AddKeyframe(
+      TransformKeyframe::Create(base::TimeDelta(), operations1, nullptr));
+  TransformOperations operations2;
+  curve1->AddKeyframe(TransformKeyframe::Create(
+      base::TimeDelta::FromSecondsD(1.0), operations2, nullptr));
+  scoped_ptr<Animation> animation(
+      Animation::Create(curve1.Pass(), 1, 1, Animation::TRANSFORM));
+  controller_impl->AddAnimation(animation.Pass());
+
+  float start_scale = 0.f;
+  EXPECT_TRUE(controller_impl->AnimationStartScale(&start_scale));
+  EXPECT_EQ(4.f, start_scale);
+
+  scoped_ptr<KeyframedTransformAnimationCurve> curve2(
+      KeyframedTransformAnimationCurve::Create());
+
+  TransformOperations operations3;
+  curve2->AddKeyframe(
+      TransformKeyframe::Create(base::TimeDelta(), operations3, nullptr));
+  operations3.AppendScale(6.0, 5.0, 4.0);
+  curve2->AddKeyframe(TransformKeyframe::Create(
+      base::TimeDelta::FromSecondsD(1.0), operations3, nullptr));
+
+  controller_impl->RemoveAnimation(1);
+  animation = Animation::Create(curve2.Pass(), 2, 2, Animation::TRANSFORM);
+
+  // Reverse Direction
+  animation->set_direction(Animation::DIRECTION_REVERSE);
+  controller_impl->AddAnimation(animation.Pass());
+
+  EXPECT_TRUE(controller_impl->AnimationStartScale(&start_scale));
+  EXPECT_EQ(6.f, start_scale);
+
+  scoped_ptr<KeyframedTransformAnimationCurve> curve3(
+      KeyframedTransformAnimationCurve::Create());
+
+  TransformOperations operations4;
+  operations4.AppendScale(7.0, 3.0, 1.0);
+  curve3->AddKeyframe(
+      TransformKeyframe::Create(base::TimeDelta(), operations4, nullptr));
+  TransformOperations operations5;
+  curve3->AddKeyframe(TransformKeyframe::Create(
+      base::TimeDelta::FromSecondsD(1.0), operations5, nullptr));
+
+  animation = Animation::Create(curve3.Pass(), 3, 3, Animation::TRANSFORM);
+  controller_impl->AddAnimation(animation.Pass());
+
+  controller_impl->GetAnimationById(2)
+      ->SetRunState(Animation::FINISHED, TicksFromSecondsF(0.0));
+
+  // Only unfinished animations should be considered by
+  // AnimationStartScale.

[ajuma, 2015/04/24 13:24:02]

The finished animation has a start of scale of 1, so this doesn't seem to be
testing that the finished animation isn't considered (since even if it was being
considered, the result wouldn't change).

[patro, 2015/05/04 12:44:05]

The finished animation has starting scale of 6.0f(The animation direction is
DIRECTION_REVERSE).
The active animation should have lower scale than finished animation so that we
can be sure that it takes only active animations into account.

+  EXPECT_TRUE(controller_impl->AnimationStartScale(&start_scale));
+  EXPECT_EQ(7.f, start_scale);
+}
+
 TEST(LayerAnimationControllerTest, MaximumTargetScale) {
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));