Index: cc/trees/layer_tree_host.h |
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h |
index a25069531a69b3af0264db45310326a1a6817411..aede050fa1d40f36a327485e3e7f9ca8d1b7a422 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(); |
@@ -304,7 +306,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, |
@@ -453,6 +456,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_; |