gpu: Compositor management of GpuMemoryBuffer instances.

cc/trees/layer_tree_host.h

Index: cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index a4af339c96301d23b110602e213d1d92c55aeda0..33eab6f4cd3f13a0d7a332eb0aa5137dd0f094f5 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -42,8 +42,8 @@
 #include "ui/gfx/rect.h"
 
 namespace cc {
-
 class AnimationRegistrar;
+class GpuMemoryBufferManager;
 class HeadsUpDisplayLayer;
 class Layer;
 class LayerTreeHostImpl;
@@ -84,7 +84,8 @@ class CC_EXPORT LayerTreeHost {
   // The SharedBitmapManager will be used on the compositor thread.
   static scoped_ptr<LayerTreeHost> CreateThreaded(
       LayerTreeHostClient* client,
-      SharedBitmapManager* manager,
+      SharedBitmapManager* shared_bitmap_manager,
+      GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const LayerTreeSettings& settings,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
@@ -92,7 +93,8 @@ class CC_EXPORT LayerTreeHost {
   static scoped_ptr<LayerTreeHost> CreateSingleThreaded(
       LayerTreeHostClient* client,
       LayerTreeHostSingleThreadClient* single_thread_client,
-      SharedBitmapManager* manager,
+      SharedBitmapManager* shared_bitmap_manager,
+      GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const LayerTreeSettings& settings,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
   virtual ~LayerTreeHost();
@@ -302,7 +304,8 @@ class CC_EXPORT LayerTreeHost {
 
  protected:
   LayerTreeHost(LayerTreeHostClient* client,
-                SharedBitmapManager* manager,
+                SharedBitmapManager* shared_bitmap_manager,
+                GpuMemoryBufferManager* gpu_memory_buffer_manager,
                 const LayerTreeSettings& settings);
   void InitializeThreaded(
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
@@ -451,6 +454,7 @@ class CC_EXPORT LayerTreeHost {
   LayerSelectionBound selection_end_;
 
   SharedBitmapManager* shared_bitmap_manager_;
+  GpuMemoryBufferManager* gpu_memory_buffer_manager_;
 
   ScopedPtrVector<SwapPromise> swap_promise_list_;
   std::set<SwapPromiseMonitor*> swap_promise_monitor_;