Implement GpuMemoryBufferManager::CreateGpuMemoryBufferFromClientId

content/browser/gpu/browser_gpu_memory_buffer_manager.h

 // Copyright 2014 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 CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 11 matching lines @@
 
 namespace content {
 
 using GpuMemoryBufferConfigurationKey =
     std::pair<gfx::BufferFormat, gfx::BufferUsage>;
 using GpuMemoryBufferConfigurationSet =
     base::hash_set<GpuMemoryBufferConfigurationKey>;
 
 }  // content
 
+namespace gpu {
+class GpuMemoryBufferImpl;
+}  // gpu
+
 namespace BASE_HASH_NAMESPACE {
 
 template <>
 struct hash<content::GpuMemoryBufferConfigurationKey> {
   size_t operator()(const content::GpuMemoryBufferConfigurationKey& key) const {
     return base::HashInts(static_cast<int>(key.first),
                           static_cast<int>(key.second));
   }
 };
 
@@ skipping 62 matching lines @@
                                             gfx::BufferUsage usage) const;
 
  private:
   struct BufferInfo {
     BufferInfo();
     BufferInfo(const gfx::Size& size,
                gfx::GpuMemoryBufferType type,
                gfx::BufferFormat format,
                gfx::BufferUsage usage,
                int gpu_host_id);
-    BufferInfo(const BufferInfo& other);
+    BufferInfo(BufferInfo&& other);
     ~BufferInfo();
 
     gfx::Size size;
     gfx::GpuMemoryBufferType type = gfx::EMPTY_BUFFER;
     gfx::BufferFormat format = gfx::BufferFormat::RGBA_8888;
     gfx::BufferUsage usage = gfx::BufferUsage::GPU_READ;
     int gpu_host_id = 0;
+
+    // For buffers created for a child process, open an instance of the
+    // buffer in the browser process for future use by
+    // CreateGpuMemoryBufferFromClientId.
+    std::unique_ptr<gpu::GpuMemoryBufferImpl> parent_buffer_instance;

[reveman, 2016/05/24 22:19:47]

This is not just needed for FromClientId. It's needed for all buffers in case
the GPU process crashes. Can we rename this to simply |buffer|, use it on all
platforms and remove the fields above that are no longer needed?

[ccameron, 2016/05/24 22:58:04]

Definitely agree with this long-term. Removing the fields is a pretty big
refactor, and will need testing for each platform. I'd prefer to get this in
piecemeal.

   };
 
   struct CreateGpuMemoryBufferRequest;
   struct CreateGpuMemoryBufferFromHandleRequest;
   struct CreateGpuMemoryBufferFromClientIdRequest;
 
   using CreateDelegate = base::Callback<void(GpuProcessHost* host,
                                              gfx::GpuMemoryBufferId id,
                                              const gfx::Size& size,
                                              gfx::BufferFormat format,
@@ skipping 51 matching lines @@
   using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
   using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_