viz: Move some code into //components/viz/common.

components/viz/common/server_gpu_memory_buffer_manager.h

 // Copyright 2016 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 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>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #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 during construction. So makes
sense to expose this dep to users?

[danakj, 2017/06/15 15:08:58]

I don't think we need to. The fact that they inject the mojom needs *they* need
to construct, and depend on, the mojom types. It doesn't need to come from here.

[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 anymore I don't think, and could be
expanded to explain what we discussed about mus and gpu service using this
(without naming names cuz layering etc)?

[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 HostGMBManager, but then, it is used
from viz too (which is non-host). So we ended up with ServerGMBManager, while
clients use ClientGMBManager. I can rename it to something better if you have
suggestions.

[danakj, 2017/06/15 15:08:58]

Ah there is a Client one. Hm.. we need a host+service name, this will surely
happen again. Idk what tho right now.

                                      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,
                               int client_id,
                               const gpu::SyncToken& sync_token);
 
   void DestroyAllGpuMemoryBufferForClient(int client_id);
 
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle(
       gfx::GpuMemoryBufferId id,
       int client_id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       gpu::SurfaceHandle surface_handle);
 
   // Overridden from gpu::GpuMemoryBufferManager:
   std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       gpu::SurfaceHandle surface_handle) override;
   void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
                                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;
 
   using NativeBuffers =
       std::unordered_set<gfx::GpuMemoryBufferId,
                          BASE_HASH_NAMESPACE::hash<gfx::GpuMemoryBufferId>>;
   std::unordered_map<int, NativeBuffers> native_buffers_;
 
   const gpu::GpuMemoryBufferConfigurationSet native_configurations_;
   base::WeakPtrFactory<ServerGpuMemoryBufferManager> weak_factory_;
 
   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_