Fix stale compositor references from ui::Layer

ui/gfx/compositor/layer.h

 // Copyright (c) 2011 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_GFX_COMPOSITOR_LAYER_H_
 #define UI_GFX_COMPOSITOR_LAYER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 30 matching lines @@
 class COMPOSITOR_EXPORT Layer :
     public LayerAnimationDelegate,
     NON_EXPORTED_BASE(public WebKit::WebLayerClient),
     NON_EXPORTED_BASE(public WebKit::WebContentLayerClient) {
  public:
   enum LayerType {
     LAYER_HAS_NO_TEXTURE = 0,
     LAYER_HAS_TEXTURE = 1
   };
 
-  // |compositor| can be NULL, and will be set later when the Layer is added to
-  // a Compositor.
-  explicit Layer(Compositor* compositor);
-  Layer(Compositor* compositor, LayerType type);
+  Layer();
+  explicit Layer(LayerType type);
   virtual ~Layer();
 
   // 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();
 
   // 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);
 
@@ skipping 81 matching lines @@
   void SetFillsBoundsOpaquely(bool fills_bounds_opaquely);
   bool fills_bounds_opaquely() const { return fills_bounds_opaquely_; }
 
   // Returns the invalid rectangle. That is, the region of the layer that needs
   // to be repainted. This is exposed for testing and isn't generally useful.
   const gfx::Rect& invalid_rect() const { return invalid_rect_; }
 
   const gfx::Rect& hole_rect() const {  return hole_rect_; }
 
   // The compositor.
   const Compositor* compositor() const { return compositor_; }

[sky, 2011/11/15 04:57:04]

Can these be removed? Seems error prone to use this instead of GetCompositor.

[piman, 2011/11/15 22:06:33]

Good idea. Done.

   Compositor* compositor() { return compositor_; }
 
   const ui::Texture* texture() const { return texture_.get(); }
 
   // |texture| cannot be NULL, and this function cannot be called more than
   // once.
   // TODO(beng): This can be removed from the API when we are in a
   //             single-compositor world.
   void SetExternalTexture(ui::Texture* texture);
 
@@ skipping 143 matching lines @@
   WebKit::WebLayer web_layer_;
   bool web_layer_is_accelerated_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_GFX_COMPOSITOR_LAYER_H_