| Index: ui/compositor/layer_animation_element_unittest.cc
|
| diff --git a/ui/compositor/layer_animation_element_unittest.cc b/ui/compositor/layer_animation_element_unittest.cc
|
| index 5912023739a61de922c7fb819bcd73d90bb98e1a..6ca1338974abe5f958f2dd75b9dcdecc0af34b12 100644
|
| --- a/ui/compositor/layer_animation_element_unittest.cc
|
| +++ b/ui/compositor/layer_animation_element_unittest.cc
|
| @@ -34,7 +34,7 @@ TEST(LayerAnimationElementTest, TransformElement) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| delegate.SetTransformFromAnimation(start_transform);
|
| element->Progress(start_time, &delegate);
|
| CheckApproximatelyEqual(start_transform,
|
| @@ -72,7 +72,7 @@ TEST(LayerAnimationElementTest, BoundsElement) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| delegate.SetBoundsFromAnimation(start);
|
| element->Progress(start_time, &delegate);
|
| CheckApproximatelyEqual(start, delegate.GetBoundsForAnimation());
|
| @@ -105,7 +105,7 @@ TEST(LayerAnimationElementTest, OpacityElement) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| delegate.SetOpacityFromAnimation(start);
|
| element->Progress(start_time, &delegate);
|
| EXPECT_FLOAT_EQ(start, delegate.GetOpacityForAnimation());
|
| @@ -137,7 +137,7 @@ TEST(LayerAnimationElementTest, VisibilityElement) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| delegate.SetVisibilityFromAnimation(start);
|
| element->Progress(start_time, &delegate);
|
| EXPECT_TRUE(delegate.GetVisibilityForAnimation());
|
| @@ -170,7 +170,7 @@ TEST(LayerAnimationElementTest, BrightnessElement) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| delegate.SetBrightnessFromAnimation(start);
|
| element->Progress(start_time, &delegate);
|
| EXPECT_FLOAT_EQ(start, delegate.GetBrightnessForAnimation());
|
| @@ -203,7 +203,7 @@ TEST(LayerAnimationElementTest, GrayscaleElement) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| delegate.SetGrayscaleFromAnimation(start);
|
| element->Progress(start_time, &delegate);
|
| EXPECT_FLOAT_EQ(start, delegate.GetGrayscaleForAnimation());
|
| @@ -241,7 +241,7 @@ TEST(LayerAnimationElementTest, PauseElement) {
|
| TestLayerAnimationDelegate copy = delegate;
|
|
|
| start_time += delta;
|
| - element->set_start_time(start_time);
|
| + element->set_requested_start_time(start_time);
|
| element->Progress(start_time + delta, &delegate);
|
|
|
| // Nothing should have changed.
|
|
|