Add flow control between renderer and GPU processes, and, on Mac OS X,...

chrome/common/gpu_messages_internal.h

Index: chrome/common/gpu_messages_internal.h
===================================================================
--- chrome/common/gpu_messages_internal.h	(revision 67289)
+++ chrome/common/gpu_messages_internal.h	(working copy)
@@ -51,6 +51,18 @@
   // information.
   IPC_MESSAGE_CONTROL0(GpuMsg_CollectGraphicsInfo)
 
+#if defined(OS_MACOSX)
+  // Tells the GPU process that the browser process handled the swap
+  // buffers request with the given number. Note that it is possible
+  // for the browser process to coalesce frames; it is not guaranteed
+  // that every GpuHostMsg_AcceleratedSurfaceBuffersSwapped message
+  // will result in a buffer swap on the browser side.
+  IPC_MESSAGE_CONTROL3(GpuMsg_AcceleratedSurfaceBuffersSwappedACK,
+                       int /* renderer_id */,
+                       int32 /* route_id */,
+                       uint64 /* swap_buffers_count */)
+#endif
+
   // Tells the GPU process to crash.
   IPC_MESSAGE_CONTROL0(GpuMsg_Crash)
 
@@ -93,11 +105,8 @@
   // This message notifies the browser process that the renderer
   // swapped the buffers associated with the given "window", which
   // should cause the browser to redraw the compositor's contents.
-  IPC_MESSAGE_CONTROL4(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
-                       int32, /* renderer_id */
-                       int32, /* render_view_id */
-                       gfx::PluginWindowHandle /* window */,
-                       uint64 /* surface_id */)
+  IPC_MESSAGE_CONTROL1(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
+                       GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params)
 #endif
 
 IPC_END_MESSAGES(GpuHost)
@@ -225,13 +234,6 @@
   // browser. This message is currently used only on 10.6 and later.
   IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_SetWindowSize,
                       gfx::Size /* size */)
-
-  // This message is sent from the GPU process to the renderer process (and
-  // from there the browser process) that the buffers associated with the
-  // given "window" were swapped, which should cause the browser to redraw
-  // the various accelerated surfaces.
-  IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_AcceleratedSurfaceBuffersSwapped,
-                      gfx::PluginWindowHandle /* window */)
 #endif
 
 IPC_END_MESSAGES(GpuCommandBuffer)