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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/compositor/layer_animator_unittest.cc

Issue 1898683002: CC Animation: Erase LayerAnimationEventObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eventobserver
Patch Set: 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 | « ui/compositor/layer_animator.cc ('k') | ui/compositor/test/layer_animator_test_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animator_unittest.cc
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
index 89bb496699318ac9bcb5391409cde3c851eefd8a..6367b58f4c50612ce34ed5f7989980e0ef76317c 100644
--- a/ui/compositor/layer_animator_unittest.cc
+++ b/ui/compositor/layer_animator_unittest.cc
@@ -10,7 +10,6 @@
#include "base/macros.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
-#include "cc/animation/animation_events.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_delegate.h"
@@ -372,11 +371,10 @@ TEST(LayerAnimatorTest, ScheduleThreadedAnimationThatCanRunImmediately) {
base::TimeTicks start_time = test_controller.animator()->last_step_time();
base::TimeTicks effective_start = start_time + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, effective_start));
+ ->animation_group_id());
animator->Step(effective_start + delta / 2);
@@ -481,11 +479,10 @@ TEST(LayerAnimatorTest, ScheduleThreadedAndNonThreadedAnimations) {
base::TimeTicks start_time = test_controller.animator()->last_step_time();
base::TimeTicks effective_start = start_time + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, effective_start));
+ ->animation_group_id());
animator->Step(effective_start + delta / 2);
@@ -742,11 +739,10 @@ TEST(LayerAnimatorTest, StartThreadedAnimationThatCanRunImmediately) {
base::TimeTicks start_time = test_controller.animator()->last_step_time();
base::TimeTicks effective_start = start_time + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, effective_start));
+ ->animation_group_id());
animator->Step(effective_start + delta / 2);
@@ -866,11 +862,10 @@ TEST(LayerAnimatorTest, PreemptThreadedByImmediatelyAnimatingToNewTarget) {
base::TimeTicks start_time = test_controller.animator()->last_step_time();
base::TimeTicks effective_start = start_time + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, effective_start));
+ ->animation_group_id());
animator->Step(effective_start + delta / 2);
@@ -889,11 +884,10 @@ TEST(LayerAnimatorTest, PreemptThreadedByImmediatelyAnimatingToNewTarget) {
base::TimeTicks second_effective_start = effective_start + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ second_effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, second_effective_start));
+ ->animation_group_id());
animator->Step(second_effective_start + delta / 2);
@@ -1189,11 +1183,10 @@ TEST(LayerAnimatorTest, MultiPreemptThreadedByImmediatelyAnimatingToNewTarget) {
base::TimeTicks start_time = test_controller.animator()->last_step_time();
base::TimeTicks effective_start = start_time + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, effective_start));
+ ->animation_group_id());
animator->Step(effective_start + delta / 2);
@@ -1217,11 +1210,10 @@ TEST(LayerAnimatorTest, MultiPreemptThreadedByImmediatelyAnimatingToNewTarget) {
base::TimeTicks second_effective_start = effective_start + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ second_effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, second_effective_start));
+ ->animation_group_id());
animator->Step(second_effective_start + delta / 2);
@@ -1459,22 +1451,20 @@ TEST(LayerAnimatorTest, ThreadedCyclicSequences) {
base::TimeTicks start_time = test_controller.animator()->last_step_time();
base::TimeTicks effective_start = start_time + delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, effective_start));
+ ->animation_group_id());
animator->Step(effective_start + delta);
EXPECT_TRUE(test_controller.animator()->is_animating());
EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(), target_opacity);
base::TimeTicks second_effective_start = effective_start + 2 * delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ second_effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, second_effective_start));
+ ->animation_group_id());
animator->Step(second_effective_start + delta);
@@ -1482,22 +1472,20 @@ TEST(LayerAnimatorTest, ThreadedCyclicSequences) {
EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(), start_opacity);
base::TimeTicks third_effective_start = second_effective_start + 2 * delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ third_effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, third_effective_start));
+ ->animation_group_id());
animator->Step(third_effective_start + delta);
EXPECT_TRUE(test_controller.animator()->is_animating());
EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(), target_opacity);
base::TimeTicks fourth_effective_start = third_effective_start + 2 * delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ fourth_effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, fourth_effective_start));
+ ->animation_group_id());
// Skip ahead by a lot.
animator->Step(fourth_effective_start + 1000 * delta);
@@ -1506,11 +1494,10 @@ TEST(LayerAnimatorTest, ThreadedCyclicSequences) {
EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(), target_opacity);
base::TimeTicks fifth_effective_start = fourth_effective_start + 1001 * delta;
- test_controller.animator()->OnThreadedAnimationStarted(cc::AnimationEvent(
- cc::AnimationEvent::STARTED, 0,
+ test_controller.animator()->OnThreadedAnimationStarted(
+ fifth_effective_start, cc::TargetProperty::OPACITY,
test_controller.GetRunningSequence(LayerAnimationElement::OPACITY)
- ->animation_group_id(),
- cc::TargetProperty::OPACITY, fifth_effective_start));
+ ->animation_group_id());
// Skip ahead by a lot.
animator->Step(fifth_effective_start + 999 * delta);
« no previous file with comments | « ui/compositor/layer_animator.cc ('k') | ui/compositor/test/layer_animator_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698