Revert of Converted video frame and image callbacks to use new sync tokens.

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 166 matching lines @@
   IPC_STRUCT_MEMBER(float, m21)
   IPC_STRUCT_MEMBER(float, m22)
   IPC_STRUCT_MEMBER(float, m23)
   IPC_STRUCT_MEMBER(float, m30)
   IPC_STRUCT_MEMBER(float, m31)
   IPC_STRUCT_MEMBER(float, m32)
   IPC_STRUCT_MEMBER(float, m33)
 IPC_STRUCT_END()
 #endif
 
-IPC_STRUCT_BEGIN(GpuCommandBufferMsg_CreateImage_Params)
-  IPC_STRUCT_MEMBER(int32, id)
-  IPC_STRUCT_MEMBER(gfx::GpuMemoryBufferHandle, gpu_memory_buffer)
-  IPC_STRUCT_MEMBER(gfx::Size, size)
-  IPC_STRUCT_MEMBER(gfx::BufferFormat, format)
-  IPC_STRUCT_MEMBER(uint32, internal_format)
-  IPC_STRUCT_MEMBER(uint64, image_release_count)
-IPC_STRUCT_END()
-
-IPC_STRUCT_TRAITS_BEGIN(gpu::DxDiagNode)
+  IPC_STRUCT_TRAITS_BEGIN(gpu::DxDiagNode)
   IPC_STRUCT_TRAITS_MEMBER(values)
   IPC_STRUCT_TRAITS_MEMBER(children)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice)
   IPC_STRUCT_TRAITS_MEMBER(vendor_id)
   IPC_STRUCT_TRAITS_MEMBER(device_id)
   IPC_STRUCT_TRAITS_MEMBER(active)
   IPC_STRUCT_TRAITS_MEMBER(vendor_string)
   IPC_STRUCT_TRAITS_MEMBER(device_string)
@@ skipping 126 matching lines @@
                      GpuMsg_CreateGpuMemoryBuffer_Params)
 
 // Tells the GPU process to create a new gpu memory buffer from an existing
 // handle.
 IPC_MESSAGE_CONTROL1(GpuMsg_CreateGpuMemoryBufferFromHandle,
                      GpuMsg_CreateGpuMemoryBufferFromHandle_Params)
 
 // Tells the GPU process to destroy buffer.
 IPC_MESSAGE_CONTROL3(GpuMsg_DestroyGpuMemoryBuffer,
                      gfx::GpuMemoryBufferId, /* id */
-                     int32,                  /* client_id */
-                     gpu::SyncToken /* sync_token */)
+                     int32, /* client_id */
+                     int32 /* sync_point */)
 
 // Create and initialize a hardware jpeg decoder using the specified route_id.
 // Created decoders should be freed with AcceleratedJpegDecoderMsg_Destroy when
 // no longer needed.
 IPC_SYNC_MESSAGE_CONTROL1_1(GpuMsg_CreateJpegDecoder,
                             int32 /* route_id */,
                             bool /* succeeded */)
 
 // Tells the GPU process to create a context for collecting graphics card
 // information.
@@ skipping 299 matching lines @@
 IPC_MESSAGE_ROUTED2(GpuCommandBufferMsg_SignalQuery,
                     uint32 /* query */,
                     uint32 /* signal_id */)
 
 // Response to SignalSyncPoint, SignalSyncToken, and SignalQuery.
 IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_SignalAck,
                     uint32 /* signal_id */)
 
 // Create an image from an existing gpu memory buffer. The id that can be
 // used to identify the image from a command buffer.
-IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_CreateImage,
-                    GpuCommandBufferMsg_CreateImage_Params /* params */)
+IPC_MESSAGE_ROUTED5(GpuCommandBufferMsg_CreateImage,
+                    int32 /* id */,
+                    gfx::GpuMemoryBufferHandle /* gpu_memory_buffer */,
+                    gfx::Size /* size */,
+                    gfx::BufferFormat /* format */,
+                    uint32 /* internalformat */)
 
 // Destroy a previously created image.
 IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_DestroyImage,
                     int32 /* id */)
 
 // Attaches an external image stream to the client texture.
 IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_CreateStreamTexture,
                            uint32, /* client_texture_id */
                            int32, /* stream_id */
                            bool /* succeeded */)
@@ skipping 132 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 */)