cc/animation/animation_player_unittest.cc - Issue 1950243005: Communicate MT changes to impl-only scroll offset animations

Unified Diff: cc/animation/animation_player_unittest.cc

Issue 1950243005: Communicate MT changes to impl-only scroll offset animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address review comments Created 4 years, 7 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/animation_host.cc ('K') | « cc/animation/animation_host_unittest.cc ('k') | cc/animation/element_animations_unittest.cc » ('j') | third_party/WebKit/Source/platform/animation/CompositorAnimationHost.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/animation/animation_player_unittest.cc

diff --git a/cc/animation/animation_player_unittest.cc b/cc/animation/animation_player_unittest.cc

index 14de5aadfeaa6af275aa5b66371c68c38da04678..dbef303239fb4ebf7ce95fc1ea347b9aeaf59c60 100644

--- a/cc/animation/animation_player_unittest.cc

+++ b/cc/animation/animation_player_unittest.cc

@@ -29,7 +29,7 @@ TEST_F(AnimationPlayerTest, AttachDetachLayerIfTimelineAttached) {

EXPECT_FALSE(player_->element_animations());

EXPECT_FALSE(player_->element_id());

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

EXPECT_FALSE(GetImplPlayerForLayerId(element_id_));

@@ -43,7 +43,7 @@ TEST_F(AnimationPlayerTest, AttachDetachLayerIfTimelineAttached) {

EXPECT_TRUE(player_->element_animations());

EXPECT_EQ(player_->element_id(), element_id_);

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(element_id_));

EXPECT_TRUE(player_impl_->element_animations());

@@ -54,7 +54,7 @@ TEST_F(AnimationPlayerTest, AttachDetachLayerIfTimelineAttached) {

EXPECT_FALSE(player_->element_animations());

EXPECT_FALSE(player_->element_id());

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

EXPECT_FALSE(GetImplPlayerForLayerId(element_id_));

EXPECT_FALSE(player_impl_->element_animations());

@@ -119,7 +119,7 @@ TEST_F(AnimationPlayerTest, PropertiesMutate) {

AddAnimatedFilterToPlayer(player_.get(), duration, start_brightness,

end_brightness);

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

EXPECT_FALSE(client_.IsPropertyMutated(element_id_, ElementListType::ACTIVE,

TargetProperty::OPACITY));

@@ -203,7 +203,7 @@ TEST_F(AnimationPlayerTest, AttachTwoPlayersToOneLayer) {

AddAnimatedTransformToPlayer(player2.get(), duration, transform_x,

transform_y);

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

host_impl_->ActivateAnimations();

EXPECT_FALSE(delegate1.started());

@@ -272,7 +272,7 @@ TEST_F(AnimationPlayerTest, AddRemoveAnimationToNonAttachedPlayer) {

EXPECT_TRUE(player_->element_animations()

->GetAnimationById(opacity_id));

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

EXPECT_FALSE(client_.IsPropertyMutated(element_id_, ElementListType::ACTIVE,

TargetProperty::OPACITY));

@@ -336,7 +336,7 @@ TEST_F(AnimationPlayerTest, SwitchToLayer) {

timeline_->AttachPlayer(player_);

player_->AttachElement(element_id_);

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

GetImplTimelineAndPlayerByID();

@@ -356,7 +356,7 @@ TEST_F(AnimationPlayerTest, SwitchToLayer) {

EXPECT_TRUE(player_->element_animations());

EXPECT_EQ(player_->element_id(), new_layer_id);

- host_->PushPropertiesTo(host_impl_);

+ host_->PushPropertiesTo(host_impl_, base::TimeTicks());

EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(new_layer_id));

EXPECT_TRUE(player_impl_->element_animations());