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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/animation/element_animations_unittest.cc

Issue 1987123002: cc : Track transform animation changes on transform tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/element_animations.cc ('K') | « cc/animation/element_animations.cc ('k') | cc/layers/layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f0fea69ef3d046b2e4b5e4f7ceaa1e37cb202358 100644
--- a/cc/animation/element_animations_unittest.cc
+++ b/cc/animation/element_animations_unittest.cc
@@ -2778,8 +2778,7 @@ TEST_F(ElementAnimationsTest, ActivationBetweenAnimateAndUpdateState) {
client_impl_.GetOpacity(element_id_, ElementListType::ACTIVE));
}
-TEST_F(ElementAnimationsTest,
- ObserverNotifiedWhenTransformIsPotentiallyAnimatingChanges) {
+TEST_F(ElementAnimationsTest, ObserverNotifiedWhenTransformAnimationChanges) {
CreateTestLayer(true, true);
AttachTimelinePlayerLayer();
CreateImplTimelineAndPlayer();
@@ -2789,29 +2788,45 @@ TEST_F(ElementAnimationsTest,
auto events = host_impl_->CreateEvents();
- EXPECT_FALSE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
// Case 1: An animation that's allowed to run until its finish point.
AddAnimatedTransformToElementAnimations(animations.get(), 1.0, 1, 1);
- EXPECT_TRUE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations->PushPropertiesTo(animations_impl.get());
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->ActivateAnimations();
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->Animate(kInitialTickTime);
animations_impl->UpdateState(true, events.get());
@@ -2822,45 +2837,58 @@ TEST_F(ElementAnimationsTest,
// Finish the animation.
animations->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
animations->UpdateState(true, nullptr);
- EXPECT_FALSE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations->PushPropertiesTo(animations_impl.get());
// animations_impl hasn't yet ticked at/past the end of the animation.
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->Animate(kInitialTickTime +
TimeDelta::FromMilliseconds(1000));
animations_impl->UpdateState(true, events.get());
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
-
- animations->NotifyAnimationFinished(events->events_[0]);
- events->events_.clear();
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
// Case 2: An animation that's removed before it finishes.
int animation_id =
AddAnimatedTransformToElementAnimations(animations.get(), 10.0, 2, 2);
- EXPECT_TRUE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations->PushPropertiesTo(animations_impl.get());
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->ActivateAnimations();
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->Animate(kInitialTickTime +
TimeDelta::FromMilliseconds(2000));
@@ -2870,59 +2898,101 @@ TEST_F(ElementAnimationsTest,
events->events_.clear();
animations->RemoveAnimation(animation_id);
- EXPECT_FALSE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations->PushPropertiesTo(animations_impl.get());
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->ActivateAnimations();
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
// Case 3: An animation that's aborted before it finishes.
animation_id =
AddAnimatedTransformToElementAnimations(animations.get(), 10.0, 3, 3);
- EXPECT_TRUE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations->PushPropertiesTo(animations_impl.get());
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->ActivateAnimations();
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_TRUE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_TRUE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->Animate(kInitialTickTime +
- TimeDelta::FromMilliseconds(3000));
+ TimeDelta::FromMilliseconds(2000));
animations_impl->UpdateState(true, events.get());
animations->NotifyAnimationStarted(events->events_[0]);
events->events_.clear();
animations_impl->AbortAnimations(TargetProperty::TRANSFORM);
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::PENDING));
- EXPECT_FALSE(client_impl_.GetTransformIsAnimating(element_id_,
- ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
animations_impl->Animate(kInitialTickTime +
TimeDelta::FromMilliseconds(4000));
animations_impl->UpdateState(true, events.get());
animations->NotifyAnimationAborted(events->events_[0]);
- EXPECT_FALSE(
- client_.GetTransformIsAnimating(element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
+
+ // Case 4 : An animation that's not in effect.
+ animation_id =
+ AddAnimatedTransformToElementAnimations(animations.get(), 1.0, 1, 6);
+ animations->GetAnimationById(animation_id)
+ ->set_time_offset(base::TimeDelta::FromMilliseconds(-10000));
+ animations->GetAnimationById(animation_id)
+ ->set_fill_mode(Animation::FILL_MODE_NONE);
+
+ animations->PushPropertiesTo(animations_impl.get());
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::PENDING));
+ EXPECT_FALSE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
+
+ animations_impl->ActivateAnimations();
+ EXPECT_TRUE(client_impl_.GetHasPotentialTransformAnimation(
+ element_id_, ElementListType::ACTIVE));
+ EXPECT_FALSE(client_impl_.GetTransformIsCurrentlyAnimating(
+ element_id_, ElementListType::ACTIVE));
}
TEST_F(ElementAnimationsTest, ObserverNotifiedWhenOpacityAnimationChanges) {
« cc/animation/element_animations.cc ('K') | « cc/animation/element_animations.cc ('k') | cc/layers/layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698