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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/animation/element_animations_unittest.cc

Issue 1882733005: CC Animation: Make LayerAnimationController to have just one value observer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@privatelac
Patch Set: Fix codereview issues. 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/element_animations.cc ('k') | cc/animation/layer_animation_controller.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 207dd35c7a7fa6f691403bb130bfe6be47e29ebc..ed51918e34ffd4862239b5b17f5492955244ddf7 100644
--- a/cc/animation/element_animations_unittest.cc
+++ b/cc/animation/element_animations_unittest.cc
@@ -40,8 +40,8 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {
ElementAnimations* element_animations = player_->element_animations();
EXPECT_TRUE(element_animations);
- EXPECT_TRUE(element_animations->has_active_value_observer_for_testing());
- EXPECT_FALSE(element_animations->has_pending_value_observer_for_testing());
+ EXPECT_TRUE(element_animations->needs_active_value_observations());
+ EXPECT_FALSE(element_animations->needs_pending_value_observations());
host_->PushPropertiesTo(host_impl_);
@@ -51,16 +51,13 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {
player_impl_->element_animations();
EXPECT_TRUE(element_animations_impl);
- EXPECT_FALSE(
- element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_TRUE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
+ EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
// Create the layer in the impl active tree.
client_impl_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
- EXPECT_TRUE(element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_TRUE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_TRUE(element_animations_impl->needs_active_value_observations());
+ EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
EXPECT_TRUE(client_impl_.IsLayerInTree(layer_id_, LayerTreeType::ACTIVE));
EXPECT_TRUE(client_impl_.IsLayerInTree(layer_id_, LayerTreeType::PENDING));
@@ -68,38 +65,32 @@ TEST_F(ElementAnimationsTest, AttachToLayerInActiveTree) {
// kill layer on main thread.
client_.UnregisterLayer(layer_id_, LayerTreeType::ACTIVE);
EXPECT_EQ(element_animations, player_->element_animations());
- EXPECT_FALSE(element_animations->has_active_value_observer_for_testing());
- EXPECT_FALSE(element_animations->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations->needs_active_value_observations());
+ EXPECT_FALSE(element_animations->needs_pending_value_observations());
// Sync doesn't detach LayerImpl.
host_->PushPropertiesTo(host_impl_);
EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
- EXPECT_TRUE(element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_TRUE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_TRUE(element_animations_impl->needs_active_value_observations());
+ EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
// Kill layer on impl thread in pending tree.
client_impl_.UnregisterLayer(layer_id_, LayerTreeType::PENDING);
EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
- EXPECT_TRUE(element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_FALSE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_TRUE(element_animations_impl->needs_active_value_observations());
+ EXPECT_FALSE(element_animations_impl->needs_pending_value_observations());
// Kill layer on impl thread in active tree.
client_impl_.UnregisterLayer(layer_id_, LayerTreeType::ACTIVE);
EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
- EXPECT_FALSE(
- element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_FALSE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
+ EXPECT_FALSE(element_animations_impl->needs_pending_value_observations());
// Sync doesn't change anything.
host_->PushPropertiesTo(host_impl_);
EXPECT_EQ(element_animations_impl, player_impl_->element_animations());
- EXPECT_FALSE(
- element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_FALSE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
+ EXPECT_FALSE(element_animations_impl->needs_pending_value_observations());
player_->DetachLayer();
EXPECT_FALSE(player_->element_animations());
@@ -121,8 +112,8 @@ TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {
ElementAnimations* element_animations = player_->element_animations();
EXPECT_TRUE(element_animations);
- EXPECT_FALSE(element_animations->has_active_value_observer_for_testing());
- EXPECT_FALSE(element_animations->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations->needs_active_value_observations());
+ EXPECT_FALSE(element_animations->needs_pending_value_observations());
host_->PushPropertiesTo(host_impl_);
@@ -130,26 +121,21 @@ TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {
player_impl_->element_animations();
EXPECT_TRUE(element_animations_impl);
- EXPECT_FALSE(
- element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_FALSE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
+ EXPECT_FALSE(element_animations_impl->needs_pending_value_observations());
// Create layer.
client_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
- EXPECT_TRUE(element_animations->has_active_value_observer_for_testing());
- EXPECT_FALSE(element_animations->has_pending_value_observer_for_testing());
+ EXPECT_TRUE(element_animations->needs_active_value_observations());
+ EXPECT_FALSE(element_animations->needs_pending_value_observations());
client_impl_.RegisterLayer(layer_id_, LayerTreeType::PENDING);
- EXPECT_FALSE(
- element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_TRUE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
+ EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
client_impl_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
- EXPECT_TRUE(element_animations_impl->has_active_value_observer_for_testing());
- EXPECT_TRUE(
- element_animations_impl->has_pending_value_observer_for_testing());
+ EXPECT_TRUE(element_animations_impl->needs_active_value_observations());
+ EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
}
TEST_F(ElementAnimationsTest, AddRemovePlayers) {
« no previous file with comments | « cc/animation/element_animations.cc ('k') | cc/animation/layer_animation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698