Index: cc/resources/resource_provider.cc |
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc |
index 9651ef7939f0e33347b1976d89c308492df08858..14f4880810cdc8e79893f4be89b07443283fce96 100644 |
--- a/cc/resources/resource_provider.cc |
+++ b/cc/resources/resource_provider.cc |
@@ -14,7 +14,6 @@ |
#include "base/strings/string_util.h" |
#include "cc/base/util.h" |
#include "cc/output/gl_renderer.h" // For the GLC() macro. |
-#include "cc/resources/gpu_memory_buffer_manager.h" |
#include "cc/resources/platform_color.h" |
#include "cc/resources/returned_resource.h" |
#include "cc/resources/shared_bitmap_manager.h" |
@@ -22,6 +21,7 @@ |
#include "cc/resources/transferable_resource.h" |
#include "gpu/GLES2/gl2extchromium.h" |
#include "gpu/command_buffer/client/gles2_interface.h" |
+#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
#include "third_party/khronos/GLES2/gl2.h" |
#include "third_party/khronos/GLES2/gl2ext.h" |
#include "third_party/skia/include/core/SkSurface.h" |
@@ -407,7 +407,7 @@ ResourceProvider::Child::~Child() {} |
scoped_ptr<ResourceProvider> ResourceProvider::Create( |
OutputSurface* output_surface, |
SharedBitmapManager* shared_bitmap_manager, |
- GpuMemoryBufferManager* gpu_memory_buffer_manager, |
+ gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
BlockingTaskRunner* blocking_main_thread_task_runner, |
int highp_threshold_min, |
bool use_rgba_4444_texture_format, |
@@ -1129,7 +1129,7 @@ SkSurface* ResourceProvider::ScopedWriteLockGr::GetSkSurface( |
ResourceProvider::ResourceProvider( |
OutputSurface* output_surface, |
SharedBitmapManager* shared_bitmap_manager, |
- GpuMemoryBufferManager* gpu_memory_buffer_manager, |
+ gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
BlockingTaskRunner* blocking_main_thread_task_runner, |
int highp_threshold_min, |
bool use_rgba_4444_texture_format, |