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

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

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/compositor.gyp ('k') | ui/gfx/compositor/dummy_layer_animation_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/dummy_layer_animation_delegate.h
diff --git a/ui/gfx/compositor/test_layer_animation_delegate.h b/ui/gfx/compositor/dummy_layer_animation_delegate.h
similarity index 58%
rename from ui/gfx/compositor/test_layer_animation_delegate.h
rename to ui/gfx/compositor/dummy_layer_animation_delegate.h
index 046e25cafd0c95ed714acff4100aecb36ba311bc..69b643513d370c5ca0c3e864dbb870a3abfb82bb 100644
--- a/ui/gfx/compositor/test_layer_animation_delegate.h
+++ b/ui/gfx/compositor/dummy_layer_animation_delegate.h
@@ -2,21 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_GFX_COMPOSITOR_TEST_LAYER_ANIMATION_DELEGATE_H_
-#define UI_GFX_COMPOSITOR_TEST_LAYER_ANIMATION_DELEGATE_H_
+#ifndef UI_GFX_COMPOSITOR_DUMMY_LAYER_ANIMATION_DELEGATE_H_
+#define UI_GFX_COMPOSITOR_DUMMY_LAYER_ANIMATION_DELEGATE_H_
#pragma once
#include "base/compiler_specific.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/transform.h"
-#include "ui/gfx/compositor/layer_animation_delegate.h"
+#include "ui/gfx/compositor/compositor_export.h"
+#include "ui/gfx/compositor/layer_animator_delegate.h"
namespace ui {
-class TestLayerAnimationDelegate : public LayerAnimationDelegate {
+class LayerAnimationSequence;
+
+class COMPOSITOR_EXPORT DummyLayerAnimationDelegate
+ : public LayerAnimatorDelegate {
public:
- TestLayerAnimationDelegate();
- virtual ~TestLayerAnimationDelegate();
+ DummyLayerAnimationDelegate();
+ DummyLayerAnimationDelegate(const LayerAnimationDelegate& other);
+ virtual ~DummyLayerAnimationDelegate();
// Implementation of LayerAnimationDelegate
virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE;
@@ -27,6 +32,9 @@ class TestLayerAnimationDelegate : public LayerAnimationDelegate {
virtual const Transform& GetTransformForAnimation() const OVERRIDE;
virtual float GetOpacityForAnimation() const OVERRIDE;
+ // Implementation of LayerAnimatorDelegate
+ virtual void OnLayerAnimationEnded(LayerAnimationSequence* sequence) OVERRIDE;
+
private:
gfx::Rect bounds_;
Transform transform_;
@@ -37,4 +45,4 @@ class TestLayerAnimationDelegate : public LayerAnimationDelegate {
} // namespace ui
-#endif // UI_GFX_COMPOSITOR_TEST_LAYER_ANIMATION_DELEGATE_H_
+#endif // UI_GFX_COMPOSITOR_DUMMY_LAYER_ANIMATION_DELEGATE_H_
« no previous file with comments | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/compositor/dummy_layer_animation_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698