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

Unified Diff: cc/trees/layer_tree_host_unittest_animation.cc

Issue 2538973002: CC Animation: Make AnimationPlayer to be a unit of activation. (Closed)
Patch Set: Move ScrollOffsetAnimationWasInterrupted to AnimationPlayer Created 4 years 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/test/layer_tree_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_animation.cc
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index b6c4053e7b9b86057c6ac41cfa01d442dca3faee..cb659bc6c5a6fda340254d08a5ce5837d6a0d1b2 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -250,9 +250,8 @@ class LayerTreeHostAnimationTestAnimationsGetDeleted
void AnimateLayers(LayerTreeHostImpl* host_impl,
base::TimeTicks monotonic_time) override {
- bool have_animations = !GetImplAnimationHost(host_impl)
- ->active_element_animations_for_testing()
- .empty();
+ bool have_animations =
+ !GetImplAnimationHost(host_impl)->active_players_for_testing().empty();
if (!started_animating_ && have_animations) {
started_animating_ = true;
return;
@@ -1366,9 +1365,9 @@ class LayerTreeHostAnimationTestAddAnimationAfterAnimating
void CheckAnimations(LayerTreeHostImpl* host_impl) {
GetImplTimelineAndPlayerByID(*host_impl);
- EXPECT_EQ(2u, GetImplAnimationHost(host_impl)
- ->active_element_animations_for_testing()
- .size());
+ EXPECT_EQ(
+ 2u,
+ GetImplAnimationHost(host_impl)->active_players_for_testing().size());
Animation* root_anim =
player_impl_->GetAnimation(TargetProperty::TRANSFORM);
« cc/animation/animation_host.cc ('K') | « cc/test/layer_tree_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698