cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

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 238 matching lines @@
 
   const ui::Texture* texture() const { return texture_.get(); }
 
   // Assigns a new external texture.  |texture| can be NULL to disable external
   // updates.
   void SetExternalTexture(ui::Texture* texture);
   ui::Texture* external_texture() { return texture_.get(); }
 
   // Set new TextureMailbox for this layer. Note that |mailbox| may hold a
   // shared memory resource or an actual mailbox for a texture.
-  void SetTextureMailbox(const cc::TextureMailbox& mailbox, float scale_factor);
+  void SetTextureMailbox(const cc::TextureMailbox& mailbox,
+                         scoped_ptr<cc::SingleReleaseCallback> release_callback,
+                         float scale_factor);
   cc::TextureMailbox GetTextureMailbox(float* scale_factor);
 
   // Sets a delegated frame, coming from a child compositor.
   void SetDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame,
                          gfx::Size frame_size_in_dip);
 
   bool has_external_content() {
     return texture_layer_.get() || delegated_renderer_layer_.get();
   }
 
@@ skipping 45 matching lines @@
   // ContentLayerClient
   virtual void PaintContents(
       SkCanvas* canvas, gfx::Rect clip, gfx::RectF* opaque) OVERRIDE;
   virtual void DidChangeLayerCanUseLCDText() OVERRIDE {}
 
   cc::Layer* cc_layer() { return cc_layer_; }
 
   // TextureLayerClient
   virtual unsigned PrepareTexture() OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE;
-  virtual bool PrepareTextureMailbox(cc::TextureMailbox* mailbox,
-                                     bool use_shared_memory) OVERRIDE;
+  virtual 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
   // impact, and is only used for benchmarking/testing purpose.
   void SetForceRenderSurface(bool force);
   bool force_render_surface() const { return force_render_surface_; }
 
   // LayerClient
   virtual std::string DebugName() OVERRIDE;
@@ skipping 132 matching lines @@
 
   // 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_;
   scoped_refptr<cc::SolidColorLayer> solid_color_layer_;
   scoped_refptr<cc::DelegatedRendererLayer> delegated_renderer_layer_;
   cc::Layer* cc_layer_;
 
   // If true, the layer scales the canvas and the texture with the device scale
-  // factor as appropriate. When true, the texture size is in DIP.
+  // factor as apporpriate. When true, the texture size is in DIP.
   bool scale_content_;
 
   // A cached copy of |Compositor::device_scale_factor()|.
   float device_scale_factor_;
 
   // A cached copy of the TextureMailbox given texture_layer_.
   cc::TextureMailbox mailbox_;
 
   // Device scale factor in which mailbox_ was rendered in.
   float mailbox_scale_factor_;
 
   // The size of the delegated frame in DIP, set when SetDelegatedFrame was
   // called.
   gfx::Size delegated_frame_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_