cc: Fix animation bounds computation for multiple players

cc/animation/element_animations_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/animation/element_animations.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/animation_host.h"
@@ skipping 1771 matching lines @@
       TransformKeyframe::Create(base::TimeDelta(), operations3, nullptr));
   operations3.AppendMatrix(transform3);
   curve3->AddKeyframe(TransformKeyframe::Create(
       base::TimeDelta::FromSecondsD(1.0), operations3, nullptr));
   animation =
       Animation::Create(std::move(curve3), 3, 3, TargetProperty::TRANSFORM);
   player_impl_->AddAnimation(std::move(animation));
   EXPECT_FALSE(player_impl_->TransformAnimationBoundsForBox(box, &bounds));
 }
 
+TEST_F(ElementAnimationsTest, TransformAnimationBoundsTwoPlayers) {
+  AttachTimelinePlayerLayer();
+  CreateImplTimelineAndPlayer();
+
+  scoped_refptr<AnimationPlayer> player2 =
+      AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
+  timeline_->AttachPlayer(player2);
+  player2->AttachElement(element_id_);
+
+  std::unique_ptr<KeyframedTransformAnimationCurve> curve(
+      KeyframedTransformAnimationCurve::Create());
+
+  TransformOperations operations;
+  curve->AddKeyframe(
+      TransformKeyframe::Create(base::TimeDelta(), operations, nullptr));
+  operations.AppendScale(2.0, 3.0, 4.0);
+  curve->AddKeyframe(TransformKeyframe::Create(
+      base::TimeDelta::FromSecondsD(1.0), operations, nullptr));
+
+  std::unique_ptr<Animation> animation(
+      Animation::Create(std::move(curve), 1, 1, TargetProperty::TRANSFORM));
+  player2->AddAnimation(std::move(animation));
+
+  gfx::BoxF box(1.f, 2.f, -1.f, 3.f, 4.f, 5.f);
+  gfx::BoxF bounds;
+
+  EXPECT_FALSE(player_impl_->HasTransformAnimationThatInflatesBounds());
+  EXPECT_TRUE(player2->TransformAnimationBoundsForBox(box, &bounds));
+  EXPECT_EQ(gfx::BoxF(1.f, 2.f, -4.f, 7.f, 16.f, 20.f).ToString(),
+            bounds.ToString());
+
+  EXPECT_TRUE(
+      element_animations_->TransformAnimationBoundsForBox(box, &bounds));
+  EXPECT_EQ(gfx::BoxF(1.f, 2.f, -4.f, 7.f, 16.f, 20.f).ToString(),
+            bounds.ToString());
+}
+
 // Tests that AbortAnimations aborts all animations targeting the specified
 // property.
 TEST_F(ElementAnimationsTest, AbortAnimations) {
   CreateTestLayer(false, false);
   AttachTimelinePlayerLayer();
 
   // Start with several animations, and allow some of them to reach the finished
   // state.
   player_->AddAnimation(Animation::Create(
       std::unique_ptr<AnimationCurve>(new FakeTransformTransition(1.0)), 1, 1,
@@ skipping 1748 matching lines @@
   DestroyTestMainLayer();
   EXPECT_EQ(0u, host_->ticking_players_for_testing().size());
 
   PushProperties();
   EXPECT_EQ(0u, host_->ticking_players_for_testing().size());
   EXPECT_EQ(0u, host_impl_->ticking_players_for_testing().size());
 }
 
 }  // namespace
 }  // namespace cc