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

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

Issue 8395046: Allows observers to be notified when layer animations complete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer comments. 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
Index: ui/gfx/compositor/layer_animation_element_unittest.cc
diff --git a/ui/gfx/compositor/layer_animation_element_unittest.cc b/ui/gfx/compositor/layer_animation_element_unittest.cc
index 483817ceddf4fc38ed71d2cb3ac68144d0a9b775..27940d4c9557de6fffc0ac66046eb388a5ae94c1 100644
--- a/ui/gfx/compositor/layer_animation_element_unittest.cc
+++ b/ui/gfx/compositor/layer_animation_element_unittest.cc
@@ -11,8 +11,8 @@
#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/test_layer_animation_delegate.h"
#include "ui/gfx/compositor/test_utils.h"
namespace ui {
@@ -22,7 +22,7 @@ namespace {
// Check that the transformation element progresses the delegate as expected and
// that the element can be reused after it completes.
TEST(LayerAnimationElementTest, TransformElement) {
- DummyLayerAnimationDelegate delegate;
+ TestLayerAnimationDelegate delegate;
Transform start_transform, target_transform, middle_transform;
start_transform.SetRotate(-90);
target_transform.SetRotate(90);
@@ -54,7 +54,7 @@ TEST(LayerAnimationElementTest, TransformElement) {
// Check that the bounds element progresses the delegate as expected and
// that the element can be reused after it completes.
TEST(LayerAnimationElementTest, BoundsElement) {
- DummyLayerAnimationDelegate delegate;
+ TestLayerAnimationDelegate delegate;
gfx::Rect start, target, middle;
start = target = middle = gfx::Rect(0, 0, 50, 50);
start.set_x(-90);
@@ -84,7 +84,7 @@ TEST(LayerAnimationElementTest, BoundsElement) {
// Check that the opacity element progresses the delegate as expected and
// that the element can be reused after it completes.
TEST(LayerAnimationElementTest, OpacityElement) {
- DummyLayerAnimationDelegate delegate;
+ TestLayerAnimationDelegate delegate;
float start = 0.0;
float middle = 0.5;
float target = 1.0;
@@ -121,8 +121,8 @@ TEST(LayerAnimationElementTest, PauseElement) {
scoped_ptr<LayerAnimationElement> element(
LayerAnimationElement::CreatePauseElement(properties, delta));
- DummyLayerAnimationDelegate delegate;
- DummyLayerAnimationDelegate copy = delegate;
+ TestLayerAnimationDelegate delegate;
+ TestLayerAnimationDelegate copy = delegate;
element->Progress(1.0, &delegate);

Powered by Google App Engine
This is Rietveld 408576698