Enable sync allocation of GpuMemoryBuffers from the browser process.

content/browser/gpu/browser_gpu_channel_host_factory.h

 // Copyright (c) 2012 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_CHANNEL_HOST_FACTORY_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 30 matching lines @@
   virtual void DeleteGpuMemoryBuffer(
       scoped_ptr<gfx::GpuMemoryBuffer> buffer) OVERRIDE {}
 
   // GpuMemoryBufferFactoryHost implementation.
   virtual void CreateGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       unsigned internalformat,
       unsigned usage,
       const CreateGpuMemoryBufferCallback& callback) OVERRIDE;
+  virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferSync(
+      const gfx::GpuMemoryBufferHandle& handle,
+      const gfx::Size& size,
+      unsigned internalformat,
+      unsigned usage) OVERRIDE;
   virtual void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
                                       int32 sync_point) OVERRIDE;
 
   // Specify a task runner and callback to be used for a set of messages. The
   // callback will be set up on the current GpuProcessHost, identified by
   // GpuProcessHostId().
   virtual void SetHandlerForControlMessages(
       const uint32* message_ids,
       size_t num_messages,
       const base::Callback<void(const IPC::Message&)>& handler,
       base::TaskRunner* target_task_runner);
   int GpuProcessHostId() { return gpu_host_id_; }
   GpuChannelHost* EstablishGpuChannelSync(
       CauseForGpuLaunch cause_for_gpu_launch);
   void EstablishGpuChannel(CauseForGpuLaunch cause_for_gpu_launch,
                            const base::Closure& callback);
   GpuChannelHost* GetGpuChannel();
   int GetGpuChannelId() { return gpu_client_id_; }
 
   // Used to skip GpuChannelHost tests when there can be no GPU process.
   static bool CanUseForTesting();
 
  private:
   struct CreateRequest;
+  class CreateGpuMemoryBufferRequest;
   class EstablishRequest;
 
   BrowserGpuChannelHostFactory();
   virtual ~BrowserGpuChannelHostFactory();
 
   void GpuChannelEstablished();
   void CreateViewCommandBufferOnIO(
       CreateRequest* request,
       int32 surface_id,
       const GPUCreateCommandBufferConfig& init_params);
   static void CommandBufferCreatedOnIO(CreateRequest* request,
                                        CreateCommandBufferResult result);
   static void AddFilterOnIO(int gpu_host_id,
                             scoped_refptr<IPC::MessageFilter> filter);
 
-  void CreateGpuMemoryBufferOnIO(const gfx::GpuMemoryBufferHandle& handle,
-                                 const gfx::Size& size,
-                                 unsigned internalformat,
-                                 unsigned usage,
-                                 uint32 request_id);
+  void CreateGpuMemoryBufferOnIO(
+      const gfx::GpuMemoryBufferHandle& handle,
+      const gfx::Size& size,
+      unsigned internalformat,
+      unsigned usage,
+      scoped_refptr<CreateGpuMemoryBufferRequest> request);
   void GpuMemoryBufferCreatedOnIO(
-      uint32 request_id,
+      scoped_refptr<CreateGpuMemoryBufferRequest> request,
       const gfx::GpuMemoryBufferHandle& handle);
   void OnGpuMemoryBufferCreated(
       uint32 request_id,
       const gfx::GpuMemoryBufferHandle& handle);
   void DestroyGpuMemoryBufferOnIO(const gfx::GpuMemoryBufferHandle& handle,
                                   int32 sync_point);
 
   const int gpu_client_id_;
   scoped_ptr<base::WaitableEvent> shutdown_event_;
   scoped_refptr<GpuChannelHost> gpu_channel_;
   int gpu_host_id_;
   scoped_refptr<EstablishRequest> pending_request_;
   std::vector<base::Closure> established_callbacks_;
 
   uint32 next_create_gpu_memory_buffer_request_id_;
   typedef std::map<uint32, CreateGpuMemoryBufferCallback>
       CreateGpuMemoryBufferCallbackMap;
   CreateGpuMemoryBufferCallbackMap create_gpu_memory_buffer_requests_;
 
   static BrowserGpuChannelHostFactory* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_