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

Unified Diff: cc/animation/animation_player_unittest.cc

Issue 1877073006: CC Animation: Make AnimationRegistrar a private member of AnimationHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/animation/animation_host.cc ('k') | cc/animation/element_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 6e165fd7466c0881d82136a8f42b5237a969ee4d..de5b2c1650804d27a31b7add37fedf0d21b6e39a 100644
--- a/cc/animation/animation_player_unittest.cc
+++ b/cc/animation/animation_player_unittest.cc
@@ -7,7 +7,6 @@
#include "cc/animation/animation_delegate.h"
#include "cc/animation/animation_host.h"
#include "cc/animation/animation_id_provider.h"
-#include "cc/animation/animation_registrar.h"
#include "cc/animation/animation_timeline.h"
#include "cc/animation/element_animations.h"
#include "cc/test/animation_test_common.h"
@@ -136,7 +135,7 @@ TEST_F(AnimationPlayerTest, PropertiesMutate) {
EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
TargetProperty::FILTER));
- host_impl_->animation_registrar()->ActivateAnimations();
+ host_impl_->ActivateAnimations();
base::TimeTicks time;
time += base::TimeDelta::FromSecondsD(0.1);
@@ -205,7 +204,7 @@ TEST_F(AnimationPlayerTest, AttachTwoPlayersToOneLayer) {
transform_y);
host_->PushPropertiesTo(host_impl_);
- host_impl_->animation_registrar()->ActivateAnimations();
+ host_impl_->ActivateAnimations();
EXPECT_FALSE(delegate1.started_);
EXPECT_FALSE(delegate1.finished_);
@@ -287,7 +286,7 @@ TEST_F(AnimationPlayerTest, AddRemoveAnimationToNonAttachedPlayer) {
EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
TargetProperty::FILTER));
- host_impl_->animation_registrar()->ActivateAnimations();
+ host_impl_->ActivateAnimations();
base::TimeTicks time;
time += base::TimeDelta::FromSecondsD(0.1);
« no previous file with comments | « cc/animation/animation_host.cc ('k') | cc/animation/element_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698