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

Unified Diff: ui/gfx/compositor/layer_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 with master. 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_unittest.cc
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
index 33ecee95cc74a0803378f10c43cf4818af1f16b9..6b75cd687a52e8d39f0a9d1dad5d1c857b791b39 100644
--- a/ui/gfx/compositor/layer_unittest.cc
+++ b/ui/gfx/compositor/layer_unittest.cc
@@ -9,6 +9,7 @@
#include "ui/gfx/canvas_skia.h"
#include "ui/gfx/compositor/compositor_observer.h"
#include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/layer_animation_sequence.h"
#include "ui/gfx/compositor/test_compositor.h"
#include "ui/gfx/compositor/test_compositor_host.h"
@@ -41,7 +42,8 @@ class ColoredLayer : public Layer, public LayerDelegate {
canvas->GetSkCanvas()->drawColor(color_);
}
- virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+ virtual void OnLayerAnimationEnded(
+ const LayerAnimationSequence* animation) OVERRIDE {
}
private:
@@ -132,7 +134,8 @@ class TestLayerDelegate : public LayerDelegate {
contents.height());
color_index_ = (color_index_ + 1) % static_cast<int>(colors_.size());
}
- virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+ virtual void OnLayerAnimationEnded(
+ const LayerAnimationSequence* animation) OVERRIDE {
}
private:
@@ -160,7 +163,8 @@ class DrawTreeLayerDelegate : public LayerDelegate {
virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
painted_ = true;
}
- virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+ virtual void OnLayerAnimationEnded(
+ const LayerAnimationSequence* animation) OVERRIDE {
}
bool painted_;
@@ -178,7 +182,8 @@ class NullLayerDelegate : public LayerDelegate {
// Overridden from LayerDelegate:
virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
}
- virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE {
+ virtual void OnLayerAnimationEnded(
+ const LayerAnimationSequence* animation) OVERRIDE {
}
DISALLOW_COPY_AND_ASSIGN(NullLayerDelegate);

Powered by Google App Engine
This is Rietveld 408576698