summaryrefslogtreecommitdiffstats
path: root/content/common/gpu/gpu_messages.h
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 20:17:49 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 20:17:49 +0000
commit2a9ee22f1e672099f70d59594258f093f5520a16 (patch)
treebcf1c08958b7850141e376fce82fbe9807648a82 /content/common/gpu/gpu_messages.h
parent92922a8e913115ad091c367e5ec3acde7f26fa81 (diff)
downloadchromium_src-2a9ee22f1e672099f70d59594258f093f5520a16.zip
chromium_src-2a9ee22f1e672099f70d59594258f093f5520a16.tar.gz
chromium_src-2a9ee22f1e672099f70d59594258f093f5520a16.tar.bz2
Revert 132218 - Convert plugin and GPU process to brokered handle duplication.
(Seems to be responsible for VMTest failure on ChromiumOS). BUG=119250 Review URL: https://chromiumcodereview.appspot.com/9958034 TBR=jschuh@chromium.org Review URL: https://chromiumcodereview.appspot.com/10081018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_messages.h')
-rw-r--r--content/common/gpu/gpu_messages.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
index d76491a..bd6ce94 100644
--- a/content/common/gpu/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -216,10 +216,11 @@ IPC_MESSAGE_CONTROL0(GpuMsg_Hang)
// A renderer sends this when it wants to create a connection to the GPU
// process. The browser will create the GPU process if necessary, and will
// return a handle to the channel via a GpuChannelEstablished message.
-IPC_SYNC_MESSAGE_CONTROL1_3(GpuHostMsg_EstablishGpuChannel,
+IPC_SYNC_MESSAGE_CONTROL1_4(GpuHostMsg_EstablishGpuChannel,
content::CauseForGpuLaunch,
int /* client id */,
IPC::ChannelHandle /* handle to channel */,
+ base::ProcessHandle /* renderer_process_for_gpu */,
content::GPUInfo /* stats about GPU process*/)
// A renderer sends this to the browser process when it wants to
@@ -291,6 +292,13 @@ IPC_MESSAGE_CONTROL1(GpuHostMsg_AcceleratedSurfaceSuspend,
// GPU Channel Messages
// These are messages from a renderer process to the GPU process.
+// Initialize a channel between a renderer process and a GPU process. The
+// renderer passes its process handle to the GPU process, which gives gives the
+// GPU process the ability to map handles from the renderer process. This must
+// be the first message sent on a newly connected channel.
+IPC_MESSAGE_CONTROL1(GpuChannelMsg_Initialize,
+ base::ProcessHandle /* renderer_process_for_gpu */)
+
// Tells the GPU process to create a new command buffer that renders to an
// offscreen frame buffer.
IPC_SYNC_MESSAGE_CONTROL2_1(GpuChannelMsg_CreateOffscreenCommandBuffer,