Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1568)

Unified Diff: content/common/gpu/client/gpu_channel_host.h

Issue 10081018: Revert 132218 - Convert plugin and GPU process to brokered handle duplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/client/gpu_channel_host.h
===================================================================
--- content/common/gpu/client/gpu_channel_host.h (revision 132251)
+++ content/common/gpu/client/gpu_channel_host.h (working copy)
@@ -13,7 +13,6 @@
#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"
@@ -84,12 +83,13 @@
// Called on the render thread
GpuChannelHost(GpuChannelHostFactory* factory,
- int gpu_host_id,
+ int gpu_process_id,
int client_id);
virtual ~GpuChannelHost();
// Connect to GPU process channel.
- void Connect(const IPC::ChannelHandle& channel_handle);
+ void Connect(const IPC::ChannelHandle& channel_handle,
+ base::ProcessHandle client_process_for_gpu);
State state() const { return state_; }
@@ -152,8 +152,7 @@
void ForciblyCloseChannel();
GpuChannelHostFactory* factory() const { return factory_; }
- int gpu_host_id() const { return gpu_host_id_; }
- base::ProcessId gpu_pid() const { return channel_->peer_pid(); }
+ int gpu_process_id() const { return gpu_process_id_; }
int client_id() const { return client_id_; }
private:
@@ -181,8 +180,8 @@
};
GpuChannelHostFactory* factory_;
+ int gpu_process_id_;
int client_id_;
- int gpu_host_id_;
State state_;
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.cc ('k') | content/common/gpu/client/gpu_channel_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698