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

Unified Diff: ui/compositor/test/test_layer_animation_delegate.h

Issue 1531913003: CC Animations: Make ui::LayerAnimator a LayerAnimationEventObserver (instead of ui::Layer) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix LayerAnimator::SetDelegate Created 5 years 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/compositor/layer_animator_unittest.cc ('k') | ui/compositor/test/test_layer_animation_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_layer_animation_delegate.h
diff --git a/ui/compositor/test/test_layer_animation_delegate.h b/ui/compositor/test/test_layer_animation_delegate.h
index b9061820d9e6eaff6f424b9b7534a95b43106303..f06f054b519e7233b0659b2e7007ee817d131add 100644
--- a/ui/compositor/test/test_layer_animation_delegate.h
+++ b/ui/compositor/test/test_layer_animation_delegate.h
@@ -6,6 +6,7 @@
#define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_
#include "base/compiler_specific.h"
+#include "cc/layers/layer.h"
#include "ui/compositor/layer_animation_delegate.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/transform.h"
@@ -38,8 +39,11 @@ class TestLayerAnimationDelegate : public LayerAnimationDelegate {
void AddThreadedAnimation(scoped_ptr<cc::Animation> animation) override;
void RemoveThreadedAnimation(int animation_id) override;
LayerAnimatorCollection* GetLayerAnimatorCollection() override;
+ cc::Layer* GetCcLayer() const override;
private:
+ void CreateCcLayer();
+
gfx::Rect bounds_;
gfx::Transform transform_;
float opacity_;
@@ -47,6 +51,7 @@ class TestLayerAnimationDelegate : public LayerAnimationDelegate {
float brightness_;
float grayscale_;
SkColor color_;
+ scoped_refptr<cc::Layer> cc_layer_;
// Allow copy and assign.
};
« no previous file with comments | « ui/compositor/layer_animator_unittest.cc ('k') | ui/compositor/test/test_layer_animation_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698