Make channel preemption not require view contexts for hookup

content/common/gpu/gpu_messages.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.
 
 // Multiply-included message file, hence no include guard here, but see below
 // for a much smaller-than-usual include guard section.
 
 #include <string>
 #include <vector>
 
@@ skipping 69 matching lines @@
 
 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)
   IPC_STRUCT_MEMBER(int32, share_group_id)
   IPC_STRUCT_MEMBER(int32, stream_id)
   IPC_STRUCT_MEMBER(content::GpuStreamPriority, stream_priority)
   IPC_STRUCT_MEMBER(std::vector<int>, attribs)
   IPC_STRUCT_MEMBER(GURL, active_url)
   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)
   IPC_STRUCT_MEMBER(gfx::BufferFormat, format)
   IPC_STRUCT_MEMBER(gfx::BufferUsage, usage)
   IPC_STRUCT_MEMBER(int32, client_id)
   IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, surface_handle)
 IPC_STRUCT_END()
 
 #if defined(OS_MACOSX)
@@ skipping 149 matching lines @@
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(gpu::MemoryAllocation)
   IPC_STRUCT_TRAITS_MEMBER(bytes_limit_when_visible)
   IPC_STRUCT_TRAITS_MEMBER(priority_cutoff_when_visible)
 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()
 
 //------------------------------------------------------------------------------
 // GPU Messages
 // These are messages from the browser to the GPU process.
 
 // Tells the GPU process to initialize itself. The browser explicitly
 // requests this be done so that we are guaranteed that the channel is set
 // up between the browser and GPU process before doing any work that might
 // potentially crash the GPU process. Detection of the child process
 // exiting abruptly is predicated on having the IPC channel set up.
 IPC_MESSAGE_CONTROL0(GpuMsg_Initialize)
 
 // Tells the GPU process to shutdown itself.
 IPC_MESSAGE_CONTROL0(GpuMsg_Finalize)
 
 // Tells the GPU process to create a new channel for communication with a
 // given client.  The channel name is returned in a
 // GpuHostMsg_ChannelEstablished message.  The client ID is passed so that
 // 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.
 IPC_MESSAGE_CONTROL1(GpuMsg_CloseChannel,
                      IPC::ChannelHandle /* channel_handle */)
 
 // 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 */)
 
 // Tells the GPU process to create a new gpu memory buffer.
 IPC_MESSAGE_CONTROL1(GpuMsg_CreateGpuMemoryBuffer,
                      GpuMsg_CreateGpuMemoryBuffer_Params)
 
 // Tells the GPU process to destroy buffer.
 IPC_MESSAGE_CONTROL3(GpuMsg_DestroyGpuMemoryBuffer,
                      gfx::GpuMemoryBufferId, /* id */
@@ skipping 55 matching lines @@
 // 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,
                             content::CauseForGpuLaunch,
                             int /* client id */,
                             IPC::ChannelHandle /* handle to channel */,
                             gpu::GPUInfo /* stats about GPU process*/)
 
 // 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.
 IPC_MESSAGE_CONTROL2(GpuHostMsg_Initialized,
                      bool /* result */,
                      ::gpu::GPUInfo /* gpu_info */)
 
 // Response from GPU to a GpuHostMsg_EstablishChannel message.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_ChannelEstablished,
                      IPC::ChannelHandle /* channel_handle */)
 
 // Message from GPU to notify to destroy the channel.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyChannel,
                      int32 /* client_id */)
 
 // Message to cache the given shader information.
 IPC_MESSAGE_CONTROL3(GpuHostMsg_CacheShader,
                      int32 /* client_id */,
                      std::string /* key */,
                      std::string /* shader */)
 
 // Message to the GPU that a shader was loaded from disk.
 IPC_MESSAGE_CONTROL1(GpuMsg_LoadedShader,
                      std::string /* encoded shader */)
 
 // Respond from GPU to a GpuMsg_CreateViewCommandBuffer message.
 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 */)
 
 // Response from GPU to a GpuMsg_CollectGraphicsInfo.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected,
                      gpu::GPUInfo /* GPU logging stats */)
 
 // Response from GPU to a GpuMsg_GetVideoMemory.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_VideoMemoryUsageStats,
@@ skipping 373 matching lines @@
 IPC_MESSAGE_ROUTED0(AcceleratedJpegDecoderMsg_Destroy)
 
 //------------------------------------------------------------------------------
 // Accelerated JPEG Decoder Host Messages
 // These messages are sent from the GPU process to Browser process.
 //
 // Report decode status.
 IPC_MESSAGE_ROUTED2(AcceleratedJpegDecoderHostMsg_DecodeAck,
                     int32, /* bitstream_buffer_id */
                     media::JpegDecodeAccelerator::Error /* error */)