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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/compositor/layer_animator_unittest.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 2 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/gfx/compositor/layer_animator_delegate.h ('k') | ui/gfx/compositor/layer_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/layer_animator_unittest.cc
diff --git a/ui/gfx/compositor/layer_animator_unittest.cc b/ui/gfx/compositor/layer_animator_unittest.cc
index 6eccb529460751ea8ebd18d2d044066ab74d0e4b..e92d7c5e91bbda59d03536a2d2d3a4cc09243d52 100644
--- a/ui/gfx/compositor/layer_animator_unittest.cc
+++ b/ui/gfx/compositor/layer_animator_unittest.cc
@@ -11,11 +11,11 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/transform.h"
+#include "ui/gfx/compositor/dummy_layer_animation_delegate.h"
#include "ui/gfx/compositor/layer_animation_delegate.h"
#include "ui/gfx/compositor/layer_animation_element.h"
#include "ui/gfx/compositor/layer_animation_sequence.h"
#include "ui/gfx/compositor/test_utils.h"
-#include "ui/gfx/compositor/test_layer_animation_delegate.h"
namespace ui {
@@ -27,7 +27,7 @@ TEST(LayerAnimatorTest, ImplicitAnimation) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateImplicitAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
base::TimeTicks now = base::TimeTicks::Now();
animator->SetOpacity(0.5);
@@ -41,7 +41,7 @@ TEST(LayerAnimatorTest, ImplicitAnimation) {
TEST(LayerAnimatorTest, NoImplicitAnimation) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
base::TimeTicks now = base::TimeTicks::Now();
animator->SetOpacity(0.5);
@@ -54,7 +54,7 @@ TEST(LayerAnimatorTest, NoImplicitAnimation) {
TEST(LayerAnimatorTest, StopAnimatingProperty) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateImplicitAnimator());
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
base::TimeTicks now = base::TimeTicks::Now();
double target_opacity(0.5);
@@ -74,7 +74,7 @@ TEST(LayerAnimatorTest, StopAnimatingProperty) {
TEST(LayerAnimatorTest, StopAnimating) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateImplicitAnimator());
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
base::TimeTicks now = base::TimeTicks::Now();
double target_opacity(0.5);
@@ -94,7 +94,7 @@ TEST(LayerAnimatorTest, ScheduleAnimationThatCanRunImmediately) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -131,7 +131,7 @@ TEST(LayerAnimatorTest, ScheduleTwoAnimationsThatCanRunImmediately) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -181,7 +181,7 @@ TEST(LayerAnimatorTest, ScheduleTwoAnimationsOnSameProperty) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -233,7 +233,7 @@ TEST(LayerAnimatorTest, ScheduleBlockedAnimation) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -311,7 +311,7 @@ TEST(LayerAnimatorTest, ScheduleTogether) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -364,7 +364,7 @@ TEST(LayerAnimatorTest, StartAnimationThatCanRunImmediately) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -399,7 +399,7 @@ TEST(LayerAnimatorTest, StartAnimationThatCanRunImmediately) {
TEST(LayerAnimatorTest, PreemptBySettingNewTarget) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -428,7 +428,7 @@ TEST(LayerAnimatorTest, PreemptByImmediatelyAnimatingToNewTarget) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -480,7 +480,7 @@ TEST(LayerAnimatorTest, PreemptEnqueueNewAnimation) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -533,7 +533,7 @@ TEST(LayerAnimatorTest, PreemptyByReplacingQueuedAnimations) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
@@ -588,7 +588,7 @@ TEST(LayerAnimatorTest, CyclicSequences) {
scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
AnimationContainerElement* element = animator.get();
animator->set_disable_timer_for_test(true);
- TestLayerAnimationDelegate delegate;
+ DummyLayerAnimationDelegate delegate;
animator->SetDelegate(&delegate);
double start_opacity(0.0);
« no previous file with comments | « ui/gfx/compositor/layer_animator_delegate.h ('k') | ui/gfx/compositor/layer_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698