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

Unified Diff: cc/test/animation_timelines_test_common.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/test/animation_timelines_test_common.cc
diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc
index d3b80f602da3713b82301da22d2253f9bd439b03..41f7a1a6ff5ce086e3b63bd603665c8ff9c02401 100644
--- a/cc/test/animation_timelines_test_common.cc
+++ b/cc/test/animation_timelines_test_common.cc
@@ -31,7 +31,7 @@ void TestLayer::ClearMutatedProperties() {
opacity_ = 0;
brightness_ = 0;
- for (int i = 0; i <= Animation::LAST_TARGET_PROPERTY; ++i)
+ for (int i = 0; i <= kLastTargetProperty; ++i)
mutated_properties_[i] = false;
}
@@ -129,10 +129,9 @@ void TestHostClient::UnregisterLayer(int layer_id, LayerTreeType tree_type) {
layers_in_tree.erase(kv);
}
-bool TestHostClient::IsPropertyMutated(
- int layer_id,
- LayerTreeType tree_type,
- Animation::TargetProperty property) const {
+bool TestHostClient::IsPropertyMutated(int layer_id,
+ LayerTreeType tree_type,
+ AnimationTargetProperty property) const {
TestLayer* layer = FindTestLayer(layer_id, tree_type);
return layer->is_property_mutated(property);
}
@@ -141,7 +140,7 @@ void TestHostClient::ExpectFilterPropertyMutated(int layer_id,
LayerTreeType tree_type,
float brightness) const {
TestLayer* layer = FindTestLayer(layer_id, tree_type);
- EXPECT_TRUE(layer->is_property_mutated(Animation::OPACITY));
+ EXPECT_TRUE(layer->is_property_mutated(AnimationTargetProperty::OPACITY));
EXPECT_EQ(brightness, layer->brightness());
}
@@ -149,7 +148,7 @@ void TestHostClient::ExpectOpacityPropertyMutated(int layer_id,
LayerTreeType tree_type,
float opacity) const {
TestLayer* layer = FindTestLayer(layer_id, tree_type);
- EXPECT_TRUE(layer->is_property_mutated(Animation::OPACITY));
+ EXPECT_TRUE(layer->is_property_mutated(AnimationTargetProperty::OPACITY));
EXPECT_EQ(opacity, layer->opacity());
}
@@ -158,7 +157,7 @@ void TestHostClient::ExpectTransformPropertyMutated(int layer_id,
int transform_x,
int transform_y) const {
TestLayer* layer = FindTestLayer(layer_id, tree_type);
- EXPECT_TRUE(layer->is_property_mutated(Animation::OPACITY));
+ EXPECT_TRUE(layer->is_property_mutated(AnimationTargetProperty::OPACITY));
EXPECT_EQ(transform_x, layer->transform_x());
EXPECT_EQ(transform_y, layer->transform_y());
}
@@ -180,13 +179,13 @@ TestAnimationDelegate::TestAnimationDelegate()
void TestAnimationDelegate::NotifyAnimationStarted(
base::TimeTicks monotonic_time,
- Animation::TargetProperty target_property,
+ AnimationTargetProperty target_property,
int group) {
started_ = true;
}
void TestAnimationDelegate::NotifyAnimationFinished(
base::TimeTicks monotonic_time,
- Animation::TargetProperty target_property,
+ AnimationTargetProperty target_property,
int group) {
finished_ = true;
}

Powered by Google App Engine
This is Rietveld 408576698