Chromium Code Reviews| Index: components/mus/public/cpp/lib/gpu_channel_host_factory_mus.h |
| diff --git a/components/mus/surfaces/ozone_gpu_memory_buffer_manager.h b/components/mus/public/cpp/lib/gpu_channel_host_factory_mus.h |
| similarity index 59% |
| copy from components/mus/surfaces/ozone_gpu_memory_buffer_manager.h |
| copy to components/mus/public/cpp/lib/gpu_channel_host_factory_mus.h |
| index a522714b6bcd4219ed47e2c3c159338ab0f4f42e..e8bf51b9308450e2e2606fe78e1e3b7e178b84e4 100644 |
| --- a/components/mus/surfaces/ozone_gpu_memory_buffer_manager.h |
| +++ b/components/mus/public/cpp/lib/gpu_channel_host_factory_mus.h |
| @@ -2,20 +2,20 @@ |
| // 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_PUBLIC_CPP_LIB_GPU_MEMORY_BUFFER_MANAGER_MUS_H_ |
| +#define COMPONENTS_MUS_PUBLIC_CPP_LIB_GPU_MEMORY_BUFFER_MANAGER_MUS_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 GpuMemoryBufferManagerMus : public gpu::GpuMemoryBufferManager { |
|
Fady Samuel
2016/05/25 17:06:47
nit: mus seems redundant here.
Peng
2016/05/25 19:42:55
oops! Remove this file.
|
| public: |
| - OzoneGpuMemoryBufferManager(); |
| - ~OzoneGpuMemoryBufferManager() override; |
| + GpuMemoryBufferManagerMus(); |
| + ~GpuMemoryBufferManagerMus() override; |
| - // gpu::GpuMemoryBufferManager: |
| + // Overridden from gpu::GpuMemoryBufferManager: |
| std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( |
| const gfx::Size& size, |
| gfx::BufferFormat format, |
| @@ -25,18 +25,12 @@ class OzoneGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager { |
| const gfx::GpuMemoryBufferHandle& handle, |
| const gfx::Size& size, |
| gfx::BufferFormat format) override; |
| - std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromClientId( |
| - int client_id, |
| - const gfx::GpuMemoryBufferId& gpu_memory_buffer_id) override; |
| gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer( |
| ClientBuffer buffer) override; |
| void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer, |
| const gpu::SyncToken& sync_token) override; |
| - |
| - private: |
| - DISALLOW_COPY_AND_ASSIGN(OzoneGpuMemoryBufferManager); |
| }; |
| } // namespace mus |
| -#endif // COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_ |
| +#endif // COMPONENTS_MUS_PUBLIC_CPP_LIB_GPU_MEMORY_BUFFER_MANAGER_MUS_H_ |