Make channel preemption not require view contexts for hookup

content/common/gpu/gpu_messages.h

Index: content/common/gpu/gpu_messages.h
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
index 008beee69566ae1fcad4ce0c4dad2ba5d82cbca5..fa37750767c0dfd05522d2e40e0c6131854de874 100644
--- a/content/common/gpu/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -87,6 +87,15 @@ IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)
   IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference)
 IPC_STRUCT_END()
 
+IPC_STRUCT_BEGIN(GpuMsg_EstablishChannel_Params)
+  IPC_STRUCT_MEMBER(int, client_id)
+  IPC_STRUCT_MEMBER(uint64, client_tracing_id)
+  IPC_STRUCT_MEMBER(bool, preempts)
+  IPC_STRUCT_MEMBER(bool, preempted)
+  IPC_STRUCT_MEMBER(bool, allow_future_sync_points)
+  IPC_STRUCT_MEMBER(bool, allow_real_time_streams)
+IPC_STRUCT_END()
+
 IPC_STRUCT_BEGIN(GpuMsg_CreateGpuMemoryBuffer_Params)
   IPC_STRUCT_MEMBER(gfx::GpuMemoryBufferId, id)
   IPC_STRUCT_MEMBER(gfx::Size, size)
@@ -256,7 +265,6 @@ IPC_STRUCT_TRAITS_END()
 IPC_STRUCT_TRAITS_BEGIN(gfx::GLSurfaceHandle)
   IPC_STRUCT_TRAITS_MEMBER(handle)
   IPC_STRUCT_TRAITS_MEMBER(transport_type)
-  IPC_STRUCT_TRAITS_MEMBER(parent_client_id)
 IPC_STRUCT_TRAITS_END()
 
 //------------------------------------------------------------------------------
@@ -279,12 +287,8 @@ IPC_MESSAGE_CONTROL0(GpuMsg_Finalize)
 // the GPU process reuses an existing channel to that process if it exists.
 // This ID is a unique opaque identifier generated by the browser process.
 // The client_tracing_id is a unique ID used for the purposes of tracing.
-IPC_MESSAGE_CONTROL5(GpuMsg_EstablishChannel,
-                     int /* client_id */,
-                     uint64 /* client_tracing_id */,
-                     bool /* share_context */,
-                     bool /* allow_future_sync_points */,
-                     bool /* allow_real_time_streams */)
+IPC_MESSAGE_CONTROL1(GpuMsg_EstablishChannel,
+                     GpuMsg_EstablishChannel_Params /* params */)
 
 // Tells the GPU process to close the channel identified by IPC channel
 // handle.  If no channel can be identified, do nothing.
@@ -293,10 +297,9 @@ IPC_MESSAGE_CONTROL1(GpuMsg_CloseChannel,
 
 // Tells the GPU process to create a new command buffer that renders directly
 // to a native view. A corresponding GpuCommandBufferStub is created.
-IPC_MESSAGE_CONTROL5(GpuMsg_CreateViewCommandBuffer,
-                     gfx::GLSurfaceHandle, /* compositing_surface */
-                     int32, /* surface_id */
-                     int32, /* client_id */
+IPC_MESSAGE_CONTROL4(GpuMsg_CreateViewCommandBuffer,
+                     gfx::GLSurfaceHandle,         /* compositing_surface */
+                     int32,                        /* client_id */
                      GPUCreateCommandBufferConfig, /* init_params */
                      int32 /* route_id */)
 
@@ -372,10 +375,9 @@ IPC_SYNC_MESSAGE_CONTROL1_3(GpuHostMsg_EstablishGpuChannel,
 
 // A renderer sends this to the browser process when it wants to
 // create a GL context associated with the given view_id.
-IPC_SYNC_MESSAGE_CONTROL3_1(GpuHostMsg_CreateViewCommandBuffer,
-                            int32, /* surface_id */
+IPC_SYNC_MESSAGE_CONTROL2_1(GpuHostMsg_CreateViewCommandBuffer,
                             GPUCreateCommandBufferConfig, /* init_params */
-                            int32, /* route_id */
+                            int32,                        /* route_id */
                             content::CreateCommandBufferResult /* result */)
 
 // Response from GPU to a GputMsg_Initialize message.
@@ -405,11 +407,6 @@ IPC_MESSAGE_CONTROL1(GpuMsg_LoadedShader,
 IPC_MESSAGE_CONTROL1(GpuHostMsg_CommandBufferCreated,
                      content::CreateCommandBufferResult /* result */)
 
-// Request from GPU to free the browser resources associated with the
-// command buffer.
-IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyCommandBuffer,
-                     int32 /* surface_id */)
-
 // Response from GPU to a GpuMsg_CreateGpuMemoryBuffer message.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_GpuMemoryBufferCreated,
                      gfx::GpuMemoryBufferHandle /* handle */)