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

Unified Diff: ui/gfx/compositor/layer.h

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.h
diff --git a/ui/gfx/compositor/layer.h b/ui/gfx/compositor/layer.h
index 1bb51e9710c7f7abe11e98823cb8ee3d5ef35ae9..2d0a9754a0585c1a98d7a84f249af0d86377ee86 100644
--- a/ui/gfx/compositor/layer.h
+++ b/ui/gfx/compositor/layer.h
@@ -18,7 +18,7 @@
#include "ui/gfx/rect.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/compositor/layer_animator_delegate.h"
+#include "ui/gfx/compositor/layer_animation_delegate.h"
#include "ui/gfx/compositor/layer_delegate.h"
class SkCanvas;
@@ -39,7 +39,7 @@ class Texture;
// delete a Layer and it has children, the parent of each child layer is set to
// NULL, but the children are not deleted.
class COMPOSITOR_EXPORT Layer :
- public LayerAnimatorDelegate,
+ public LayerAnimationDelegate,
NON_EXPORTED_BASE(public WebKit::WebLayerClient),
NON_EXPORTED_BASE(public WebKit::WebContentLayerClient) {
public:
@@ -281,7 +281,6 @@ class COMPOSITOR_EXPORT Layer :
virtual const gfx::Rect& GetBoundsForAnimation() const OVERRIDE;
virtual const Transform& GetTransformForAnimation() const OVERRIDE;
virtual float GetOpacityForAnimation() const OVERRIDE;
- virtual void OnLayerAnimationEnded(LayerAnimationSequence* sequence) OVERRIDE;
#if defined(USE_WEBKIT_COMPOSITOR)
void CreateWebLayer();

Powered by Google App Engine
This is Rietveld 408576698