Convert plugin and GPU process to brokered handle duplication.

content/common/gpu/client/gpu_channel_host.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_CLIENT_GPU_CHANNEL_HOST_H_
 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/process.h"
 #include "base/process_util.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/message_router.h"
 #include "content/public/common/gpu_info.h"
 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_channel.h"
@@ skipping 50 matching lines @@
     kUnconnected,
     // Ready to use.
     kConnected,
     // An error caused the host to become disconnected. Recreate channel to
     // reestablish connection.
     kLost
   };
 
   // Called on the render thread
   GpuChannelHost(GpuChannelHostFactory* factory,
-                 int gpu_process_id,
+                 int gpu_host_id,
                  int client_id);
   virtual ~GpuChannelHost();
 
   // Connect to GPU process channel.
-  void Connect(const IPC::ChannelHandle& channel_handle,
-               base::ProcessHandle client_process_for_gpu);
+  void Connect(const IPC::ChannelHandle& channel_handle);
 
   State state() const { return state_; }
 
   // Change state to kLost.
   void SetStateLost();
 
   // The GPU stats reported by the GPU process.
   void set_gpu_info(const content::GPUInfo& gpu_info);
   const content::GPUInfo& gpu_info() const;
 
@@ skipping 42 matching lines @@
   bool WillGpuSwitchOccur(bool is_creating_context,
                           gfx::GpuPreference gpu_preference);
 
   // Forcibly close the channel on the GPU process side. This will
   // cause all command buffers on this side to soon afterward start
   // registering lost contexts. It also has the side effect of setting
   // the state on this side to lost.
   void ForciblyCloseChannel();
 
   GpuChannelHostFactory* factory() const { return factory_; }
-  int gpu_process_id() const { return gpu_process_id_; }
+  base::ProcessId gpu_process_id() const { return channel_->peer_pid(); }

[apatrick_chromium, 2012/04/10 20:00:35]

I checked the one caller of this function and I think it actually wants the host
ID rather than the PID. So this should be:

int gpu_process_id() const { return gpu_host_id_; }

The name of the function should be gpu_host_id() or similar but I'll fix that
once you've landed. I'm a bit baffled that the tests worked. My best guess is
that both the host ID and PID have the property of uniquely identifying a
GpuProcessHost object, unless a PID is recycled.

[jschuh, 2012/04/10 23:30:59]

I just corrected it and added the gpu_host_id stuff in. The dependent sandbox
patch is landed so I'm running through the trybots now.

   int client_id() const { return client_id_; }
 
  private:
   // A filter used internally to route incoming messages from the IO thread
   // to the correct message loop.
   class MessageFilter : public IPC::ChannelProxy::MessageFilter {
    public:
     explicit MessageFilter(GpuChannelHost* parent);
     virtual ~MessageFilter();
 
     void AddRoute(int route_id,
                   base::WeakPtr<IPC::Channel::Listener> listener,
                   scoped_refptr<base::MessageLoopProxy> loop);
     void RemoveRoute(int route_id);
 
     // IPC::ChannelProxy::MessageFilter implementation:
     virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
     virtual void OnChannelError() OVERRIDE;
 
    private:
     GpuChannelHost* parent_;
 
     typedef base::hash_map<int, GpuListenerInfo> ListenerMap;
     ListenerMap listeners_;
   };
 
   GpuChannelHostFactory* factory_;
-  int gpu_process_id_;
   int client_id_;
+  int gpu_host_id_;
 
   State state_;
 
   content::GPUInfo gpu_info_;
 
   scoped_ptr<IPC::SyncChannel> channel_;
   scoped_refptr<MessageFilter> channel_filter_;
 
   // Used to look up a proxy from its routing id.
   typedef base::hash_map<int, CommandBufferProxyImpl*> ProxyMap;
   ProxyMap proxies_;
 
   // A lock to guard against concurrent access to members like the proxies map
   // for calls from contexts that may live on the compositor or main thread.
   mutable base::Lock context_lock_;
 
   // A filter for sending messages from thread other than the main thread.
   scoped_refptr<IPC::SyncMessageFilter> sync_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
 };
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_