Make EstablishGpuChannel synchronous. Remove obsolete Synchronize msg.

content/browser/gpu/gpu_process_host.h

 // Copyright (c) 2011 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_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #pragma once
 
 #include <map>
 #include <queue>
@@ skipping 48 matching lines @@
                     base::ProcessHandle,
                     const GPUInfo&>::Type
     EstablishChannelCallback;
 
   // Tells the GPU process to create a new channel for communication with a
   // renderer. Once the GPU process responds asynchronously with the IPC handle
   // and GPUInfo, we call the callback.
   void EstablishGpuChannel(
       int renderer_id, EstablishChannelCallback* callback);
 
-  typedef Callback0::Type SynchronizeCallback;
-
-  // Sends a reply message later when the next GpuHostMsg_SynchronizeReply comes
-  // in.
-  void Synchronize(SynchronizeCallback* callback);
-
   typedef Callback1<int32>::Type CreateCommandBufferCallback;
 
   // Tells the GPU process to create a new command buffer that draws into the
   // window associated with the given renderer.
   void CreateViewCommandBuffer(
       gfx::PluginWindowHandle compositing_surface,
       int32 render_view_id,
       int32 renderer_id,
       const GPUCreateCommandBufferConfig& init_params,
       CreateCommandBufferCallback* callback);
 
  private:
   GpuProcessHost(int host_id);
   virtual ~GpuProcessHost();
 
   bool Init();
 
   // Post an IPC message to the UI shim's message handler on the UI thread.
   void RouteOnUIThread(const IPC::Message& message);
 
   virtual bool CanShutdown();
   virtual void OnProcessLaunched();
   virtual void OnChildDied();
   virtual void OnProcessCrashed(int exit_code);
 
   // Message handlers.
   void OnChannelEstablished(const IPC::ChannelHandle& channel_handle);
-  void OnSynchronizeReply();
   void OnCommandBufferCreated(const int32 route_id);
   void OnDestroyCommandBuffer(
       gfx::PluginWindowHandle window, int32 renderer_id, int32 render_view_id);
   void OnGraphicsInfoCollected(const GPUInfo& gpu_info);
 
   bool LaunchGpuProcess();
 
   void SendOutstandingReplies();
   void EstablishChannelError(
       EstablishChannelCallback* callback,
       const IPC::ChannelHandle& channel_handle,
       base::ProcessHandle renderer_process_for_gpu,
       const GPUInfo& gpu_info);
   void CreateCommandBufferError(CreateCommandBufferCallback* callback,
                                 int32 route_id);
-  void SynchronizeError(SynchronizeCallback* callback);
 
   // The serial number of the GpuProcessHost / GpuProcessHostUIShim pair.
   int host_id_;
 
   // These are the channel requests that we have already sent to
   // the GPU process, but haven't heard back about yet.
   std::queue<linked_ptr<EstablishChannelCallback> > channel_requests_;
 
-  // The pending synchronization requests we need to reply to.
-  std::queue<linked_ptr<SynchronizeCallback> > synchronize_requests_;
-
   // The pending create command buffer requests we need to reply to.
   std::queue<linked_ptr<CreateCommandBufferCallback> >
       create_command_buffer_requests_;
 
 #if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
   typedef std::pair<int32 /* renderer_id */,
                     int32 /* render_view_id */> ViewID;
 
   // Encapsulates surfaces that we lock when creating view command buffers.
   // We release this lock once the command buffer (or associated GPU process)
@@ skipping 16 matching lines @@
   // Whether we are running a GPU thread inside the browser process instead
   // of a separate GPU process.
   bool in_process_;
 
   scoped_ptr<GpuMainThread> in_process_gpu_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_