| Index: cc/animation/element_animations_unittest.cc
|
| diff --git a/cc/animation/element_animations_unittest.cc b/cc/animation/element_animations_unittest.cc
|
| index ce755cc148e04009b3aa5534d2e967c9ad33a310..8349b87b4fe664d20324a7bb5c28f779923863f0 100644
|
| --- a/cc/animation/element_animations_unittest.cc
|
| +++ b/cc/animation/element_animations_unittest.cc
|
| @@ -61,7 +61,7 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {
|
| EXPECT_TRUE(element_animations->has_element_in_active_list());
|
| EXPECT_FALSE(element_animations->has_element_in_pending_list());
|
|
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
|
|
| GetImplTimelineAndPlayerByID();
|
|
|
| @@ -89,7 +89,7 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {
|
| EXPECT_FALSE(element_animations->has_element_in_pending_list());
|
|
|
| // Sync doesn't detach LayerImpl.
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
| EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
|
| EXPECT_TRUE(element_animations_impl->has_element_in_active_list());
|
| EXPECT_TRUE(element_animations_impl->has_element_in_pending_list());
|
| @@ -107,7 +107,7 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {
|
| EXPECT_FALSE(element_animations_impl->has_element_in_pending_list());
|
|
|
| // Sync doesn't change anything.
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
| EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
|
| EXPECT_FALSE(element_animations_impl->has_element_in_active_list());
|
| EXPECT_FALSE(element_animations_impl->has_element_in_pending_list());
|
| @@ -123,7 +123,7 @@ TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {
|
| host_->AddAnimationTimeline(timeline_);
|
| timeline_->AttachPlayer(player_);
|
|
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
|
|
| GetImplTimelineAndPlayerByID();
|
|
|
| @@ -136,7 +136,7 @@ TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {
|
| EXPECT_FALSE(element_animations->has_element_in_active_list());
|
| EXPECT_FALSE(element_animations->has_element_in_pending_list());
|
|
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
|
|
| scoped_refptr<ElementAnimations> element_animations_impl =
|
| player_impl_->element_animations();
|
| @@ -183,7 +183,7 @@ TEST_F(ElementAnimationsTest, AddRemovePlayers) {
|
| EXPECT_EQ(element_animations, player1->element_animations());
|
| EXPECT_EQ(element_animations, player2->element_animations());
|
|
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
| GetImplTimelineAndPlayerByID();
|
|
|
| scoped_refptr<ElementAnimations> element_animations_impl =
|
| @@ -206,7 +206,7 @@ TEST_F(ElementAnimationsTest, AddRemovePlayers) {
|
| EXPECT_EQ(element_animations, player_->element_animations());
|
| EXPECT_EQ(element_animations, player1->element_animations());
|
|
|
| - host_->PushPropertiesTo(host_impl_);
|
| + host_->PushPropertiesTo(host_impl_, base::TimeTicks());
|
| EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
|
|
|
| int list_size_after = 0;
|
|
|