Modified old wait sync point functions to also accept new sync tokens.

content/renderer/media/rtc_video_decoder.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 15 matching lines @@
 
 namespace base {
 class WaitableEvent;
 };
 
 namespace media {
 class DecoderBuffer;
 class GpuVideoAcceleratorFactories;
 }
 
+namespace gpu {
+struct SyncToken;
+}
+
 namespace content {
 
 // This class uses hardware accelerated video decoder to decode video for
 // WebRTC. |vda_message_loop_| is the message loop proxy of the media thread,
 // which VDA::Client methods run on. webrtc::VideoDecoder methods run on WebRTC
 // DecodingThread or Chrome_libJingle_WorkerThread, which are trampolined to
 // |vda_message_loop_|. Decode() is non-blocking and queues the buffers. Decoded
 // frames are delivered to WebRTC on |vda_message_loop_|.
 class CONTENT_EXPORT RTCVideoDecoder
     : NON_EXPORTED_BASE(public webrtc::VideoDecoder),
@@ skipping 93 matching lines @@
       const gfx::Rect& visible_rect);
 
   // Resets VDA.
   void ResetInternal();
 
   // Static method is to allow it to run even after RVD is deleted.
   static void ReleaseMailbox(base::WeakPtr<RTCVideoDecoder> decoder,
                              media::GpuVideoAcceleratorFactories* factories,
                              int64 picture_buffer_id,
                              uint32 texture_id,
-                             uint32 release_sync_point);
+                             const gpu::SyncToken& release_sync_token);
   // Tells VDA that a picture buffer can be recycled.
   void ReusePictureBuffer(int64 picture_buffer_id);
 
   // Create |vda_| on |vda_loop_proxy_|.
   void CreateVDA(media::VideoCodecProfile profile, base::WaitableEvent* waiter);
 
   void DestroyTextures();
   void DestroyVDA();
 
   // Gets a shared-memory segment of at least |min_size| bytes from
@@ skipping 115 matching lines @@
   // Must be destroyed, or invalidated, on |vda_loop_proxy_|
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<RTCVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_