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

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 1904653002: CC Animation: Merge LayerAnimationController into ElementAnimations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor optimization: Don't init value observations if same host. Created 4 years, 8 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
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index ce72cad844e6b928ba8981b46cf9bb13c1cf3cf2..6eeeaea22b1194df3af4ff46f528f6bfd9d38727 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -16,7 +16,6 @@
#include "cc/animation/animation_id_provider.h"
#include "cc/animation/animation_player.h"
#include "cc/animation/keyframed_animation_curve.h"
-#include "cc/animation/layer_animation_controller.h"
#include "cc/animation/transform_operations.h"
#include "cc/base/math_util.h"
#include "cc/input/main_thread_scrolling_reason.h"
@@ -8944,7 +8943,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingLayerImpl) {
root_ptr->id(), player.get());
host_impl.active_tree()
->animation_host()
- ->GetControllerForLayerId(root_ptr->id())
+ ->GetElementAnimationsForLayerId(root_ptr->id())
->AddAnimation(std::move(transform_animation));
grandchild_ptr->set_visible_layer_rect(gfx::Rect());
child_ptr->SetScrollClipLayer(root_ptr->id());
@@ -9000,7 +8999,7 @@ TEST_F(LayerTreeHostCommonTest, LayerSkippingInSubtreeOfSingularTransform) {
host_impl()
->active_tree()
->animation_host()
- ->GetControllerForLayerId(grand_child->id())
+ ->GetElementAnimationsForLayerId(grand_child->id())
->AddAnimation(std::move(transform_animation));
ExecuteCalculateDrawProperties(root);
@@ -9070,7 +9069,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingPendingLayerImpl) {
root_ptr->id(), player.get());
host_impl.active_tree()
->animation_host()
- ->GetControllerForLayerId(root_ptr->id())
+ ->GetElementAnimationsForLayerId(root_ptr->id())
->AddAnimation(std::move(animation));
root_ptr->SetOpacity(0);
grandchild_ptr->set_visible_layer_rect(gfx::Rect());
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698