| Index: components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h
|
| diff --git a/cc/test/test_gpu_memory_buffer_manager.h b/components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h
|
| similarity index 55%
|
| copy from cc/test/test_gpu_memory_buffer_manager.h
|
| copy to components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h
|
| index d084436a09ea5acd79eea8cd8d92fa2573759214..ae4df363c0f9843a31aef04a6e5c09490db03e86 100644
|
| --- a/cc/test/test_gpu_memory_buffer_manager.h
|
| +++ b/components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h
|
| @@ -1,33 +1,33 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 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 CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
|
| -#define CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
|
| -
|
| +#ifndef COMPONENTS_VIEW_MANAGER_GLES2_MOJO_GPU_MEMORY_BUFFER_MANAGER_H_
|
| +#define COMPONENTS_VIEW_MANAGER_GLES2_MOJO_GPU_MEMORY_BUFFER_MANAGER_H_
|
| +
|
| #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
|
|
|
| -namespace cc {
|
| -
|
| -class TestGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
|
| - public:
|
| - TestGpuMemoryBufferManager();
|
| - ~TestGpuMemoryBufferManager() override;
|
| -
|
| - // Overridden from gpu::GpuMemoryBufferManager:
|
| - scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| - const gfx::Size& size,
|
| - gfx::GpuMemoryBuffer::Format format,
|
| - gfx::GpuMemoryBuffer::Usage usage) override;
|
| - gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
|
| - ClientBuffer buffer) override;
|
| - void SetDestructionSyncPoint(gfx::GpuMemoryBuffer* buffer,
|
| - uint32 sync_point) override;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(TestGpuMemoryBufferManager);
|
| +namespace gles2 {
|
| +
|
| +class MojoGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
|
| + public:
|
| + MojoGpuMemoryBufferManager();
|
| + ~MojoGpuMemoryBufferManager() override;
|
| +
|
| + // Overridden from gpu::GpuMemoryBufferManager:
|
| + scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| + const gfx::Size& size,
|
| + gfx::GpuMemoryBuffer::Format format,
|
| + gfx::GpuMemoryBuffer::Usage usage) override;
|
| + gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
|
| + ClientBuffer buffer) override;
|
| + void SetDestructionSyncPoint(gfx::GpuMemoryBuffer* buffer,
|
| + uint32 sync_point) override;
|
| +
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(MojoGpuMemoryBufferManager);
|
| };
|
|
|
| -} // namespace cc
|
| +} // namespace gles2
|
|
|
| -#endif // CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
|
| +#endif // COMPONENTS_VIEW_MANAGER_GLES2_MOJO_GPU_MEMORY_BUFFER_MANAGER_H_
|
|
|