Fix lost context recreation race in BrowserGpuChannelHostFactory

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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
@@ skipping 21 matching lines @@
       int32 surface_id,
       const GPUCreateCommandBufferConfig& init_params) OVERRIDE;
   virtual GpuChannelHost* EstablishGpuChannelSync(
       CauseForGpuLaunch cause_for_gpu_launch) OVERRIDE;
 
  private:
   struct CreateRequest {
     CreateRequest();
     ~CreateRequest();
     base::WaitableEvent event;
+    int gpu_host_id;
     int32 route_id;
   };
 
   struct EstablishRequest {
-    EstablishRequest();
+    explicit EstablishRequest(CauseForGpuLaunch);
     ~EstablishRequest();
     base::WaitableEvent event;
+    CauseForGpuLaunch cause_for_gpu_launch;
+    int gpu_host_id;
+    bool reused_gpu_process;
     IPC::ChannelHandle channel_handle;
     GPUInfo gpu_info;
   };
 
   BrowserGpuChannelHostFactory();
   virtual ~BrowserGpuChannelHostFactory();
 
   void CreateViewCommandBufferOnIO(
       CreateRequest* request,
       int32 surface_id,
       const GPUCreateCommandBufferConfig& init_params);
   static void CommandBufferCreatedOnIO(CreateRequest* request, int32 route_id);
-  void EstablishGpuChannelOnIO(EstablishRequest* request,
-                               CauseForGpuLaunch cause_for_gpu_launch);
-  static void GpuChannelEstablishedOnIO(
+  void EstablishGpuChannelOnIO(EstablishRequest* request);
+  void GpuChannelEstablishedOnIO(
       EstablishRequest* request,
       const IPC::ChannelHandle& channel_handle,
       const GPUInfo& gpu_info);
 
   int gpu_client_id_;
   scoped_ptr<base::WaitableEvent> shutdown_event_;
   scoped_refptr<GpuChannelHost> gpu_channel_;
   int gpu_host_id_;
 
   static BrowserGpuChannelHostFactory* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_CHANNEL_HOST_FACTORY_H_