gpu: Simplify the error handling during gpu memory buffer allocation.

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>
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/hash.h"
 #include "base/macros.h"
 #include "base/trace_event/memory_dump_provider.h"
+#include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/content_export.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
 
 namespace content {
-class GpuProcessHost;
 
 class CONTENT_EXPORT BrowserGpuMemoryBufferManager
     : public gpu::GpuMemoryBufferManager,
       public base::trace_event::MemoryDumpProvider {
  public:
   using CreateCallback =
       base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)>;
   using AllocationCallback = CreateCallback;
 
   BrowserGpuMemoryBufferManager(int gpu_client_id,
@@ skipping 44 matching lines @@
 
     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;
   };
 
   struct CreateGpuMemoryBufferRequest;
 
-  using CreateDelegate = base::Callback<void(GpuProcessHost* host,
-                                             gfx::GpuMemoryBufferId id,
-                                             const gfx::Size& size,
-                                             gfx::BufferFormat format,
-                                             gfx::BufferUsage usage,
-                                             int client_id,
-                                             const CreateCallback& callback)>;
-
   std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       gpu::SurfaceHandle surface_handle);
 
   // Functions that handle synchronous buffer creation requests.
   void HandleCreateGpuMemoryBufferOnIO(CreateGpuMemoryBufferRequest* request);
   void HandleGpuMemoryBufferCreatedOnIO(
       CreateGpuMemoryBufferRequest* request,
       const gfx::GpuMemoryBufferHandle& handle);
 
   // Functions that implement asynchronous buffer creation.
-  void CreateGpuMemoryBufferOnIO(const CreateDelegate& create_delegate,
-                                 gfx::GpuMemoryBufferId id,
+  void CreateGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                  const gfx::Size& size,
                                  gfx::BufferFormat format,
                                  gfx::BufferUsage usage,
+                                 gpu::SurfaceHandle surface_handle,
                                  int client_id,
-                                 bool reused_gpu_process,
                                  const CreateCallback& callback);
-  void GpuMemoryBufferCreatedOnIO(const CreateDelegate& create_delegate,
-                                  gfx::GpuMemoryBufferId id,
+  void GpuMemoryBufferCreatedOnIO(gfx::GpuMemoryBufferId id,
+                                  gpu::SurfaceHandle surface_handle,
                                   int client_id,
                                   int gpu_host_id,
-                                  bool reused_gpu_process,
                                   const CreateCallback& callback,
-                                  const gfx::GpuMemoryBufferHandle& handle);
+                                  const gfx::GpuMemoryBufferHandle& handle,
+                                  GpuProcessHost::BufferCreationStatus status);
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                   int client_id,
                                   const gpu::SyncToken& sync_token);
 
   uint64_t ClientIdToTracingProcessId(int client_id) const;
 
   const gpu::GpuMemoryBufferConfigurationSet native_configurations_;
   const int gpu_client_id_;
   const uint64_t gpu_client_tracing_id_;
 
-  // The GPU process host ID. This should only be accessed on the IO thread.
-  int gpu_host_id_;
-
   // Stores info about buffers for all clients. This should only be accessed
   // on the IO thread.
   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_