Chromium Code Reviews| Index: components/viz/common/server_gpu_memory_buffer_manager.h |
| diff --git a/services/ui/common/server_gpu_memory_buffer_manager.h b/components/viz/common/server_gpu_memory_buffer_manager.h |
| similarity index 84% |
| rename from services/ui/common/server_gpu_memory_buffer_manager.h |
| rename to components/viz/common/server_gpu_memory_buffer_manager.h |
| index c86117b6c5cf0fa0db587fc383e6bc55cbf3d2f2..4f4dcfa027d34f4cd0f02bc2cbd213de5bba58c5 100644 |
| --- a/services/ui/common/server_gpu_memory_buffer_manager.h |
| +++ b/components/viz/common/server_gpu_memory_buffer_manager.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| -#define SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| +#ifndef COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| +#define COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| #include <memory> |
| @@ -14,14 +14,15 @@ |
| #include "gpu/ipc/host/gpu_memory_buffer_support.h" |
| #include "services/ui/gpu/interfaces/gpu_service.mojom.h" |
|
danakj
2017/06/14 22:57:57
move to the .cc and forward declare it?
sadrul
2017/06/14 23:18:34
The user has to inject in the mojom interface duri
danakj
2017/06/15 15:08:58
I don't think we need to. The fact that they injec
sadrul
2017/06/15 16:34:13
Good point. Thanks. Made this change.
|
| -namespace ui { |
| +namespace viz { |
| // This GpuMemoryBufferManager is for establishing a GpuChannelHost used by |
| // mus locally. |
|
danakj
2017/06/14 22:57:57
Please update this comment, it is not right anymor
sadrul
2017/06/14 23:18:34
Done.
|
| class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager, |
|
danakj
2017/06/14 22:57:57
While we're here, why is this called "Server"?
sadrul
2017/06/14 23:18:34
It's used by the non-clients. It could be HostGMBM
danakj
2017/06/15 15:08:58
Ah there is a Client one. Hm.. we need a host+serv
|
| public base::ThreadChecker { |
| public: |
| - ServerGpuMemoryBufferManager(mojom::GpuService* gpu_service, int client_id); |
| + ServerGpuMemoryBufferManager(ui::mojom::GpuService* gpu_service, |
| + int client_id); |
| ~ServerGpuMemoryBufferManager() override; |
| void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, |
| @@ -48,7 +49,7 @@ class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager, |
| const gpu::SyncToken& sync_token) override; |
| private: |
| - mojom::GpuService* gpu_service_; |
| + ui::mojom::GpuService* gpu_service_; |
| const int client_id_; |
| int next_gpu_memory_id_ = 1; |
| @@ -63,6 +64,6 @@ class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager, |
| DISALLOW_COPY_AND_ASSIGN(ServerGpuMemoryBufferManager); |
| }; |
| -} // namespace ui |
| +} // namespace viz |
| -#endif // SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| +#endif // COMPONENTS_VIZ_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ |