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

Unified Diff: cc/animation/animation_player_unittest.cc

Issue 1698813002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use custom hash in unordered_set. Created 4 years, 10 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
Index: cc/animation/animation_player_unittest.cc
diff --git a/cc/animation/animation_player_unittest.cc b/cc/animation/animation_player_unittest.cc
index d8030b3ec804a5da9239f5bc2de660ce8c5fcf15..735dea90bec91bbb8e87c1cafbad028383711def 100644
--- a/cc/animation/animation_player_unittest.cc
+++ b/cc/animation/animation_player_unittest.cc
@@ -123,18 +123,18 @@ TEST_F(AnimationPlayerTest, PropertiesMutate) {
host_->PushPropertiesTo(host_impl_);
EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::OPACITY));
+ AnimationTargetProperty::OPACITY));
EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::TRANSFORM));
+ AnimationTargetProperty::TRANSFORM));
EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::FILTER));
+ AnimationTargetProperty::FILTER));
+ EXPECT_FALSE(client_impl_.IsPropertyMutated(
+ layer_id_, LayerTreeType::ACTIVE, AnimationTargetProperty::OPACITY));
+ EXPECT_FALSE(client_impl_.IsPropertyMutated(
+ layer_id_, LayerTreeType::ACTIVE, AnimationTargetProperty::TRANSFORM));
EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::OPACITY));
- EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::TRANSFORM));
- EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::FILTER));
+ AnimationTargetProperty::FILTER));
host_impl_->animation_registrar()->ActivateAnimations();
@@ -278,14 +278,14 @@ TEST_F(AnimationPlayerTest, AddRemoveAnimationToNonAttachedPlayer) {
host_->PushPropertiesTo(host_impl_);
EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::OPACITY));
- EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::OPACITY));
+ AnimationTargetProperty::OPACITY));
+ EXPECT_FALSE(client_impl_.IsPropertyMutated(
+ layer_id_, LayerTreeType::ACTIVE, AnimationTargetProperty::OPACITY));
EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::FILTER));
+ AnimationTargetProperty::FILTER));
EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::FILTER));
+ AnimationTargetProperty::FILTER));
host_impl_->animation_registrar()->ActivateAnimations();
@@ -304,9 +304,9 @@ TEST_F(AnimationPlayerTest, AddRemoveAnimationToNonAttachedPlayer) {
end_opacity);
EXPECT_FALSE(client_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::FILTER));
+ AnimationTargetProperty::FILTER));
EXPECT_FALSE(client_impl_.IsPropertyMutated(layer_id_, LayerTreeType::ACTIVE,
- Animation::FILTER));
+ AnimationTargetProperty::FILTER));
}
TEST_F(AnimationPlayerTest, AddRemoveAnimationCausesSetNeedsCommit) {

Powered by Google App Engine
This is Rietveld 408576698