Clean up ui<->cc layers interface.

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 70 matching lines @@
   // Retrieves the Layer's compositor. The Layer will walk up its parent chain
   // to locate it. Returns NULL if the Layer is not attached to a compositor.
   Compositor* GetCompositor() {
     return const_cast<Compositor*>(
         const_cast<const Layer*>(this)->GetCompositor());
   }
   const Compositor* GetCompositor() const;
 
   // 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);
+  void SetCompositor(Compositor* compositor,
+                     scoped_refptr<cc::Layer> root_layer);
+  void ResetCompositor();
 
   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.
@@ skipping 32 matching lines @@
   void SetAnimator(LayerAnimator* animator);
 
   // Returns the layer's animator. Creates a default animator of one has not
   // been set. Will not return NULL.
   LayerAnimator* GetAnimator();
 
   // The transform, relative to the parent.
   void SetTransform(const gfx::Transform& transform);
   gfx::Transform transform() const;
 
+  gfx::PointF position() const { return cc_layer_->position(); }
+
   // Return the target transform if animator is running, or the current
   // transform otherwise.
   gfx::Transform GetTargetTransform() const;
 
   // The bounds, relative to the parent.
   void SetBounds(const gfx::Rect& bounds);
   const gfx::Rect& bounds() const { return bounds_; }
 
   // The offset from our parent (stored in bounds.origin()) is an integer but we
   // may need to be at a fractional pixel offset to align properly on screen.
@@ skipping 189 matching lines @@
   void PaintContents(
       SkCanvas* canvas,
       const gfx::Rect& clip,
       ContentLayerClient::PaintingControlSetting painting_control) override;
   void PaintContentsToDisplayList(
       cc::DisplayItemList* display_list,
       const gfx::Rect& clip,
       ContentLayerClient::PaintingControlSetting painting_control) override;
   bool FillsBoundsCompletely() const override;
 
-  cc::Layer* cc_layer() { return cc_layer_; }
+  cc::Layer* cc_layer_for_testing() { return cc_layer_; }
 
   // TextureLayerClient
   bool PrepareTextureMailbox(
       cc::TextureMailbox* mailbox,
       scoped_ptr<cc::SingleReleaseCallback>* release_callback,
       bool use_shared_memory) override;
 
   float device_scale_factor() const { return device_scale_factor_; }
 
   // Forces a render surface to be used on this layer. This has no positive
@@ skipping 167 matching lines @@
   // The size of the frame or texture in DIP, set when SetShowDelegatedContent
   // or SetTextureMailbox was called.
   gfx::Size frame_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_