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

Unified Diff: ui/compositor/layer.h

Issue 184983005: Remove Views dependency from window_animations.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/aura/window.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 c62550e08c76ca727c52875abe219b2d9c4e4bb8..916a2e6a95446cc13707c9944c94a89aace45e0d 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -47,6 +47,7 @@ namespace ui {
class Compositor;
class LayerAnimator;
+class LayerOwner;
class Texture;
// Layer manages a texture, transform and a set of child Layers. Any View that
@@ -81,6 +82,8 @@ class COMPOSITOR_EXPORT Layer
LayerDelegate* delegate() { return delegate_; }
void set_delegate(LayerDelegate* delegate) { delegate_ = delegate; }
+ LayerOwner* owner() { return owner_; }
+
// Adds a new Layer to this Layer.
void Add(Layer* child);
@@ -346,6 +349,8 @@ class COMPOSITOR_EXPORT Layer
void SwitchCCLayerForTest();
private:
+ friend class LayerOwner;
+
// Stacks |child| above or below |other|. Helper method for StackAbove() and
// StackBelow().
void StackRelativeTo(Layer* child, Layer* other, bool above);
@@ -449,6 +454,8 @@ class COMPOSITOR_EXPORT Layer
LayerDelegate* delegate_;
+ LayerOwner* owner_;
+
scoped_refptr<LayerAnimator> animator_;
// Animations that are passed to AddThreadedAnimation before this layer is
« no previous file with comments | « ui/aura/window.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698