Remove Views dependency from window_animations.cc

ui/compositor/layer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_COMPOSITOR_LAYER_H_
 #define UI_COMPOSITOR_LAYER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 29 matching lines @@
 class SolidColorLayer;
 class TextureLayer;
 struct ReturnedResource;
 typedef std::vector<ReturnedResource> ReturnedResourceArray;
 }
 
 namespace ui {
 
 class Compositor;
 class LayerAnimator;
+class LayerOwner;
 class Texture;
 
 // Layer manages a texture, transform and a set of child Layers. Any View that
 // has enabled layers ends up creating a Layer to manage the texture.
 // A Layer can also be created without a texture, in which case it renders
 // nothing and is simply used as a node in a hierarchy of layers.
 // Coordinate system used in layers is DIP (Density Independent Pixel)
 // coordinates unless explicitly mentioned as pixel coordinates.
 //
 // NOTE: Unlike Views, each Layer does *not* own its child Layers. If you
@@ skipping 14 matching lines @@
   // to locate it. Returns NULL if the Layer is not attached to a compositor.
   Compositor* GetCompositor();
 
   // Called by the compositor when the Layer is set as its root Layer. This can
   // only ever be called on the root layer.
   void SetCompositor(Compositor* compositor);
 
   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);
 
   // Removes a Layer from this Layer.
   void Remove(Layer* child);
 
   // Stacks |child| above all other children.
   void StackAtTop(Layer* child);
 
   // Stacks |child| directly above |other|.  Both must be children of this
@@ skipping 245 matching lines @@
 
   // Whether this layer has animations waiting to get sent to its cc::Layer.
   bool HasPendingThreadedAnimations() {
     return pending_threaded_animations_.size() != 0;
   }
 
   // Triggers a call to SwitchToLayer.
   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);
 
   bool ConvertPointForAncestor(const Layer* ancestor, gfx::Point* point) const;
   bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const;
 
   // Implementation of LayerAnimatorDelegate
   virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE;
   virtual void SetTransformFromAnimation(
@@ skipping 83 matching lines @@
   // set to 1.
   float zoom_;
 
   // Width of the border in pixels, where the scaling is blended.
   int zoom_inset_;
 
   std::string name_;
 
   LayerDelegate* delegate_;
 
+  LayerOwner* owner_;
+
   scoped_refptr<LayerAnimator> animator_;
 
   // Animations that are passed to AddThreadedAnimation before this layer is
   // added to a tree.
   cc::ScopedPtrVector<cc::Animation> pending_threaded_animations_;
 
   // Ownership of the layer is held through one of the strongly typed layer
   // pointers, depending on which sort of layer this is.
   scoped_refptr<cc::ContentLayer> content_layer_;
   scoped_refptr<cc::TextureLayer> texture_layer_;
@@ skipping 17 matching lines @@
   // The size of the delegated frame in DIP, set when SetShowDelegatedContent
   // was called.
   gfx::Size delegated_frame_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_