gpu: reference target surfaces through a globally unique surface id.

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 <vector>
 #include <string>
 
@@ skipping 16 matching lines @@
 
 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)
   IPC_STRUCT_MEMBER(int32, share_group_id)
   IPC_STRUCT_MEMBER(std::string, allowed_extensions)
   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(GpuHostMsg_AcceleratedSurfaceNew_Params)
-  IPC_STRUCT_MEMBER(int32, client_id)
-  IPC_STRUCT_MEMBER(int32, render_view_id)
+  IPC_STRUCT_MEMBER(int32, surface_id)
   IPC_STRUCT_MEMBER(int32, width)
   IPC_STRUCT_MEMBER(int32, height)
-  IPC_STRUCT_MEMBER(uint64, surface_id)
+  IPC_STRUCT_MEMBER(uint64, surface_handle)
   IPC_STRUCT_MEMBER(int32, route_id)
 #if defined(OS_MACOSX)
   IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
   IPC_STRUCT_MEMBER(bool, create_transport_dib)
 #endif
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params)
-  IPC_STRUCT_MEMBER(int32, client_id)
-  IPC_STRUCT_MEMBER(int32, render_view_id)
-  IPC_STRUCT_MEMBER(uint64, surface_id)
+  IPC_STRUCT_MEMBER(int32, surface_id)
+  IPC_STRUCT_MEMBER(uint64, surface_handle)

[jonathan.backer, 2012/01/16 19:47:26]

Comment: It's redundant to pass both surface_id and surface_handle. I'm fine
with it as is.

[piman, 2012/01/17 19:40:54]

So, right now, we need the surface_id for routing to the right RWHV, and we sort
of need the surface_handle because you may have more than one for the same
surface_id in the EGL case.
Arguably, the host side could track which one is the front and back, and we
could avoid this extra param. We could do that later. I wouldn't want to grow
this CL further...

   IPC_STRUCT_MEMBER(int32, route_id)
 #if defined(OS_WIN)
   IPC_STRUCT_MEMBER(gfx::Size, size)
 #elif defined(OS_MACOSX)
   IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
 #endif
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params)
-  IPC_STRUCT_MEMBER(int32, client_id)
-  IPC_STRUCT_MEMBER(int32, render_view_id)
-  IPC_STRUCT_MEMBER(uint64, surface_id)
+  IPC_STRUCT_MEMBER(int32, surface_id)
+  IPC_STRUCT_MEMBER(uint64, surface_handle)
   IPC_STRUCT_MEMBER(int32, route_id)
   IPC_STRUCT_MEMBER(int, x)
   IPC_STRUCT_MEMBER(int, y)
   IPC_STRUCT_MEMBER(int, width)
   IPC_STRUCT_MEMBER(int, height)
 #if defined(OS_MACOSX)
   IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
 #endif
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params)
-  IPC_STRUCT_MEMBER(int32, client_id)
-  IPC_STRUCT_MEMBER(int32, render_view_id)
+  IPC_STRUCT_MEMBER(int32, surface_id)
   IPC_STRUCT_MEMBER(uint64, identifier)
   IPC_STRUCT_MEMBER(int32, route_id)
 #if defined(OS_MACOSX)
   IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
 #endif
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(GPUCommandBufferConsoleMessage)
   IPC_STRUCT_MEMBER(int32, id)
   IPC_STRUCT_MEMBER(std::string, message)
@@ skipping 53 matching lines @@
 
 // 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_CONTROL4(GpuMsg_CreateViewCommandBuffer,
                      gfx::PluginWindowHandle, /* compositing_surface */
-                     int32, /* render_view_id */
+                     int32, /* surface_id */
                      int32, /* client_id */
                      GPUCreateCommandBufferConfig /* init_params */)
 
 // Tells the GPU process to create a context for collecting graphics card
 // information.
 IPC_MESSAGE_CONTROL0(GpuMsg_CollectGraphicsInfo)
 
 // Tells the GPU process that the browser process has finished resizing the
 // view.
 IPC_MESSAGE_ROUTED0(AcceleratedSurfaceMsg_ResizeViewACK)
 
 // Tells the GPU process that it's safe to start rendering to the surface.
 IPC_MESSAGE_ROUTED2(AcceleratedSurfaceMsg_NewACK,
-                    uint64 /* surface_id */,
+                    uint64 /* surface_handle */,
                     TransportDIB::Handle /* shared memory buffer */)
 
 // Tells the GPU process that the browser process handled the swap
 // buffers request.
 IPC_MESSAGE_ROUTED0(AcceleratedSurfaceMsg_BuffersSwappedACK)
 
 // Tells the GPU process that the browser process handled the
 // PostSubBuffer command.
 IPC_MESSAGE_ROUTED0(AcceleratedSurfaceMsg_PostSubBufferACK)
 
@@ skipping 15 matching lines @@
 // return a handle to the channel via a GpuChannelEstablished message.
 IPC_SYNC_MESSAGE_CONTROL1_3(GpuHostMsg_EstablishGpuChannel,
                             content::CauseForGpuLaunch,
                             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
 // create a GL context associated with the given view_id.
 IPC_SYNC_MESSAGE_CONTROL2_1(GpuHostMsg_CreateViewCommandBuffer,
-                            int32, /* render_view_id */
+                            int32, /* surface_id */
                             GPUCreateCommandBufferConfig, /* init_params */
                             int32 /* route_id */)
 
 // Response from GPU to a GpuHostMsg_EstablishChannel message.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_ChannelEstablished,
                      IPC::ChannelHandle /* channel_handle */)
 
 // Respond from GPU to a GpuMsg_CreateViewCommandBuffer message.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_CommandBufferCreated,
                      int32 /* route_id */)
 
 // Request from GPU to free the browser resources associated with the
 // command buffer.
-IPC_MESSAGE_CONTROL3(GpuHostMsg_DestroyCommandBuffer,
-                     gfx::PluginWindowHandle, /* view */
-                     int32, /* render_view_id */
-                     int32 /* client_id */)
+IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyCommandBuffer,
+                     int32 /* surface_id */)
 
 // Response from GPU to a GpuMsg_CollectGraphicsInfo.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected,
                      content::GPUInfo /* GPU logging stats */)
 
 // Message from GPU to add a GPU log message to the about:gpu page.
 IPC_MESSAGE_CONTROL3(GpuHostMsg_OnLogMessage,
                      int /*severity*/,
                      std::string /* header */,
                      std::string /* message */)
 
 // Resize the window that is being drawn into. It's important that this
 // resize be synchronized with the swapping of the front and back buffers.
-IPC_MESSAGE_CONTROL4(GpuHostMsg_ResizeView,
-                     int32 /* client_id */,
-                     int32 /* render_view_id */,
+IPC_MESSAGE_CONTROL3(GpuHostMsg_ResizeView,
+                     int32 /* surface_id */,
                      int32 /* route_id */,
                      gfx::Size /* size */)
 
 // This message is sent from the GPU process to the browser to notify about a
 // new or resized surface in the GPU.  The browser allocates any resources
 // needed for it on its end and replies with an ACK containing any shared
 // resources/identifiers to be used in the GPU.
 IPC_MESSAGE_CONTROL1(GpuHostMsg_AcceleratedSurfaceNew,
                      GpuHostMsg_AcceleratedSurfaceNew_Params)
 
@@ skipping 228 matching lines @@
 
 // Confirm decoder has been flushed.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone)
 
 // Confirm decoder has been reset.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone)
 
 // Video decoder has encountered an error.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification,
                     uint32) /* Error ID */