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

Unified Diff: ui/compositor/layer.h

Issue 1012583002: CC Animations: Port UI Browser Compositor to use compositor animation timelines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@redirect
Patch Set: Rebase. 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/compositor.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 5d997ae1e54623d9307dfc75617406dcd2e84027..64fc681e28e876e5dfbea6c23d81579c8dce7321 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -34,6 +34,7 @@
class SkCanvas;
namespace cc {
+class AnimationPlayer;
class ContentLayer;
class CopyOutputRequest;
class DelegatedFrameProvider;
@@ -420,6 +421,13 @@ class COMPOSITOR_EXPORT Layer
// Creates a corresponding composited layer for |type_|.
void CreateCcLayer();
+ // Attach/Detach CC Layer animation event observers and AnimationPlayer.
+ void AttachPlayerLayer();
+ void DetachPlayerLayer();
+
+ void AttachAnimationPlayers(cc::AnimationTimeline* timeline);
+ void DetachAnimationPlayers(cc::AnimationTimeline* timeline);
+
// Recomputes and sets to |cc_layer_|.
void RecomputeDrawsContentAndUVRect();
void RecomputePosition();
@@ -502,6 +510,7 @@ class COMPOSITOR_EXPORT Layer
LayerOwner* owner_;
scoped_refptr<LayerAnimator> animator_;
+ scoped_refptr<cc::AnimationPlayer> animation_player_;
// Animations that are passed to AddThreadedAnimation before this layer is
// added to a tree.
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698