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

Unified Diff: ui/compositor/layer_animation_sequence_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_animation_sequence.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_sequence_unittest.cc
diff --git a/ui/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc
index b4ec02ba5fd0e2f5f8dca87b3f56d99e1e447275..9222046fb28cf4012435c5cf785132515643ecec 100644
--- a/ui/compositor/layer_animation_sequence_unittest.cc
+++ b/ui/compositor/layer_animation_sequence_unittest.cc
@@ -8,7 +8,6 @@
#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"
@@ -93,9 +92,9 @@ TEST(LayerAnimationSequenceTest, SingleThreadedElement) {
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));
@@ -147,9 +146,9 @@ TEST(LayerAnimationSequenceTest, MultipleElement) {
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);
@@ -175,9 +174,9 @@ TEST(LayerAnimationSequenceTest, MultipleElement) {
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));
« no previous file with comments | « ui/compositor/layer_animation_sequence.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698