| 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
|
|
|