Fix context sharing between channels to be order-independent.

content/common/gpu/gpu_channel_manager.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_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 #pragma once
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class WaitableEvent;
 }
 
+namespace gfx {
+class GLShareGroup;
+}
+
 namespace IPC {
 struct ChannelHandle;
 }
 
 class ChildThread;
 class GpuChannel;
 class GpuWatchdog;
 struct GPUCreateCommandBufferConfig;
 
 // A GpuChannelManager is a thread responsible for issuing rendering commands
@@ skipping 36 matching lines @@
   int GenerateRouteID();
   void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
   void RemoveRoute(int32 routing_id);
 
   GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; }
 
   GpuChannel* LookupChannel(int32 client_id);
 
  private:
   // Message handlers.
-  void OnEstablishChannel(int client_id, int share_client_id);
+  void OnEstablishChannel(int client_id, bool share_context);
   void OnCloseChannel(const IPC::ChannelHandle& channel_handle);
   void OnVisibilityChanged(
       int32 render_view_id, int32 client_id, bool visible);
   void OnCreateViewCommandBuffer(
       const gfx::GLSurfaceHandle& window,
       int32 render_view_id,
       int32 client_id,
       const GPUCreateCommandBufferConfig& init_params);
 
   void OnLoseAllContexts();
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_;
   base::WaitableEvent* shutdown_event_;
 
   // Used to send and receive IPC messages from the browser process.
   ChildThread* gpu_child_thread_;
 
   // These objects manage channels to individual renderer processes there is
   // one channel for each renderer process that has connected to this GPU
   // process.
   typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap;
   GpuChannelMap gpu_channels_;
+  scoped_refptr<gfx::GLShareGroup> share_group_;
   GpuMemoryManager gpu_memory_manager_;
   GpuWatchdog* watchdog_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_