| Index: content/child/child_gpu_memory_buffer_manager.h
|
| diff --git a/content/child/child_gpu_memory_buffer_manager.h b/content/child/child_gpu_memory_buffer_manager.h
|
| index 74b078f7e48ab71061ae42b974b67e11e500a9d7..d0e5655dd4ed5df4399666946c4c5eb5837228df 100644
|
| --- a/content/child/child_gpu_memory_buffer_manager.h
|
| +++ b/content/child/child_gpu_memory_buffer_manager.h
|
| @@ -5,17 +5,17 @@
|
| #ifndef CONTENT_CHILD_CHILD_GPU_MEMORY_BUFFER_MANAGER_H_
|
| #define CONTENT_CHILD_CHILD_GPU_MEMORY_BUFFER_MANAGER_H_
|
|
|
| -#include "cc/resources/gpu_memory_buffer_manager.h"
|
| #include "content/child/thread_safe_sender.h"
|
| +#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
|
|
|
| namespace content {
|
|
|
| -class ChildGpuMemoryBufferManager : public cc::GpuMemoryBufferManager {
|
| +class ChildGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
|
| public:
|
| - ChildGpuMemoryBufferManager(ThreadSafeSender* sender);
|
| + explicit ChildGpuMemoryBufferManager(ThreadSafeSender* sender);
|
| ~ChildGpuMemoryBufferManager() override;
|
|
|
| - // Overridden from cc::GpuMemoryBufferManager:
|
| + // Overridden from gpu::GpuMemoryBufferManager:
|
| scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| const gfx::Size& size,
|
| gfx::GpuMemoryBuffer::Format format,
|
|
|