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

Unified Diff: cc/test/layer_tree_test.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
Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index db75f9d70069fd3a44e642137b2f2bfcb16aeff3..d51b8c491605d04a8dc1583531424379cd3282d5 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -12,7 +12,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "cc/animation/animation.h"
#include "cc/animation/animation_host.h"
-#include "cc/animation/element_animations.h"
+#include "cc/animation/animation_player.h"
#include "cc/animation/timing_function.h"
#include "cc/base/switches.h"
#include "cc/blimp/remote_compositor_bridge.h"
@@ -239,9 +239,8 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
void UpdateAnimationState(bool start_ready_animations) override {
LayerTreeHostImpl::UpdateAnimationState(start_ready_animations);
bool has_unfinished_animation = false;
- for (const auto& it :
- animation_host()->active_element_animations_for_testing()) {
- if (it.second->HasActiveAnimation()) {
+ for (const auto& it : animation_host()->active_players_for_testing()) {
+ if (it->HasActiveAnimation()) {
has_unfinished_animation = true;
break;
}

Powered by Google App Engine
This is Rietveld 408576698