Chromium Code Reviews| Index: components/mus/gpu/gpu_memory_buffer_manager_mus_local.h |
| diff --git a/components/mus/surfaces/ozone_gpu_memory_buffer_manager.h b/components/mus/gpu/gpu_memory_buffer_manager_mus_local.h |
| similarity index 66% |
| copy from components/mus/surfaces/ozone_gpu_memory_buffer_manager.h |
| copy to components/mus/gpu/gpu_memory_buffer_manager_mus_local.h |
| index a522714b6bcd4219ed47e2c3c159338ab0f4f42e..ea6ac6fbcf04437a6fd10f63054ce18d2ce91d4e 100644 |
| --- a/components/mus/surfaces/ozone_gpu_memory_buffer_manager.h |
| +++ b/components/mus/gpu/gpu_memory_buffer_manager_mus_local.h |
| @@ -2,20 +2,21 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_ |
| -#define COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_ |
| +#ifndef COMPONENTS_MUS_GPU_GPU_MEMORY_BUFFER_MANAGER_MUS_LOCAL_H_ |
| +#define COMPONENTS_MUS_GPU_GPU_MEMORY_BUFFER_MANAGER_MUS_LOCAL_H_ |
| -#include "base/macros.h" |
| #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| namespace mus { |
| -class OzoneGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager { |
| +// A GpuMemoryBufferManager used locally. |
| +class GpuMemoryBufferManagerMusLocal : public gpu::GpuMemoryBufferManager { |
| public: |
| - OzoneGpuMemoryBufferManager(); |
| - ~OzoneGpuMemoryBufferManager() override; |
| + GpuMemoryBufferManagerMusLocal(int gpu_client_id, |
| + uint64_t gpu_client_tracing_id); |
| + ~GpuMemoryBufferManagerMusLocal() override; |
| - // gpu::GpuMemoryBufferManager: |
| + // Overridden from gpu::GpuMemoryBufferManager: |
| std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( |
| const gfx::Size& size, |
| gfx::BufferFormat format, |
| @@ -32,11 +33,8 @@ class OzoneGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager { |
| ClientBuffer buffer) override; |
| void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer, |
| const gpu::SyncToken& sync_token) override; |
|
piman
2016/05/24 22:46:53
nit: DISALLOW_COPY_AND_ASSIGN
Peng
2016/05/25 19:42:55
Done.
|
| - |
| - private: |
| - DISALLOW_COPY_AND_ASSIGN(OzoneGpuMemoryBufferManager); |
| }; |
| } // namespace mus |
| -#endif // COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_ |
| +#endif // COMPONENTS_MUS_GPU_GPU_MEMORY_BUFFER_MANAGER_MUS_LOCAL_H_ |