CC Animation: Erase LayerAnimationEventObserver.

ui/compositor/layer_animation_sequence_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer_animation_sequence.h"
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "cc/animation/animation_events.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/layer_animation_delegate.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/test/test_layer_animation_delegate.h"
 #include "ui/compositor/test/test_layer_animation_observer.h"
 #include "ui/compositor/test/test_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
@@ skipping 64 matching lines @@
   for (int i = 0; i < 2; ++i) {
     int starting_group_id = 1;
     sequence.set_animation_group_id(starting_group_id);
     start_time = effective_start + delta;
     sequence.set_start_time(start_time);
     delegate.SetOpacityFromAnimation(start);
     sequence.Start(&delegate);
     sequence.Progress(start_time, &delegate);
     EXPECT_FLOAT_EQ(start, sequence.last_progressed_fraction());
     effective_start = start_time + delta;
-    sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
-        cc::AnimationEvent::STARTED, 0, sequence.animation_group_id(),
-        cc::TargetProperty::OPACITY, effective_start));
+    sequence.OnThreadedAnimationStarted(effective_start,
+                                        cc::TargetProperty::OPACITY,
+                                        sequence.animation_group_id());
     sequence.Progress(effective_start + delta/2, &delegate);
     EXPECT_FLOAT_EQ(middle, sequence.last_progressed_fraction());
     EXPECT_TRUE(sequence.IsFinished(effective_start + delta));
     sequence.Progress(effective_start + delta, &delegate);
     EXPECT_FLOAT_EQ(target, sequence.last_progressed_fraction());
     EXPECT_FLOAT_EQ(target, delegate.GetOpacityForAnimation());
   }
 
   EXPECT_EQ(static_cast<LayerAnimationElement::AnimatableProperties>(
                 LayerAnimationElement::OPACITY),
@@ skipping 31 matching lines @@
     start_time = opacity_effective_start + 4 * delta;
     sequence.set_start_time(start_time);
     delegate.SetOpacityFromAnimation(start_opacity);
     delegate.SetTransformFromAnimation(start_transform);
 
     sequence.Start(&delegate);
     sequence.Progress(start_time, &delegate);
     EXPECT_FLOAT_EQ(0.0, sequence.last_progressed_fraction());
     opacity_effective_start = start_time + delta;
     EXPECT_EQ(starting_group_id, sequence.animation_group_id());
-    sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
-        cc::AnimationEvent::STARTED, 0, sequence.animation_group_id(),
-        cc::TargetProperty::OPACITY, opacity_effective_start));
+    sequence.OnThreadedAnimationStarted(opacity_effective_start,
+                                        cc::TargetProperty::OPACITY,
+                                        sequence.animation_group_id());
     sequence.Progress(opacity_effective_start + delta/2, &delegate);
     EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
     sequence.Progress(opacity_effective_start + delta, &delegate);
     EXPECT_FLOAT_EQ(target_opacity, delegate.GetOpacityForAnimation());
 
     // Now at the start of the pause.
     EXPECT_FLOAT_EQ(0.0, sequence.last_progressed_fraction());
     TestLayerAnimationDelegate copy = delegate;
 
     // In the middle of the pause -- nothing should have changed.
     sequence.Progress(opacity_effective_start + delta + delta/2,
                       &delegate);
     CheckApproximatelyEqual(delegate.GetBoundsForAnimation(),
                             copy.GetBoundsForAnimation());
     CheckApproximatelyEqual(delegate.GetTransformForAnimation(),
                             copy.GetTransformForAnimation());
     EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(),
                     copy.GetOpacityForAnimation());
 
     sequence.Progress(opacity_effective_start + 2 * delta, &delegate);
     CheckApproximatelyEqual(start_transform,
                             delegate.GetTransformForAnimation());
     EXPECT_FLOAT_EQ(0.0, sequence.last_progressed_fraction());
     transform_effective_start = opacity_effective_start + 3 * delta;
     EXPECT_NE(starting_group_id, sequence.animation_group_id());
-    sequence.OnThreadedAnimationStarted(cc::AnimationEvent(
-        cc::AnimationEvent::STARTED, 0, sequence.animation_group_id(),
-        cc::TargetProperty::TRANSFORM, transform_effective_start));
+    sequence.OnThreadedAnimationStarted(transform_effective_start,
+                                        cc::TargetProperty::TRANSFORM,
+                                        sequence.animation_group_id());
     sequence.Progress(transform_effective_start + delta/2, &delegate);
     EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
     EXPECT_TRUE(sequence.IsFinished(transform_effective_start + delta));
     sequence.Progress(transform_effective_start + delta, &delegate);
     CheckApproximatelyEqual(target_transform,
                             delegate.GetTransformForAnimation());
   }
 
   EXPECT_EQ(
       static_cast<LayerAnimationElement::AnimatableProperties>(
@@ skipping 74 matching lines @@
     EXPECT_TRUE(!observer.last_ended_sequence());
     sequence.Progress(start_time + delta, &delegate);
     EXPECT_EQ(observer.last_ended_sequence(), &sequence);
     sequence.RemoveObserver(&observer);
   }
 }
 
 } // namespace
 
 } // namespace ui