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

media/base/video_frame.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.
 
 #ifndef MEDIA_BASE_VIDEO_FRAME_H_
 #define MEDIA_BASE_VIDEO_FRAME_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 59 matching lines @@
     STORAGE_LAST = STORAGE_HOLE,
 #elif defined(OS_LINUX)
     STORAGE_LAST = STORAGE_DMABUFS,
 #else
     STORAGE_LAST = STORAGE_SHMEM
 #endif
   };
 
   // CB to be called on the mailbox backing this frame when the frame is
   // destroyed.
-  typedef base::Callback<void(uint32)> ReleaseMailboxCB;
+  typedef base::Callback<void(uint32, const gpu::SyncToken&)> ReleaseMailboxCB;
 
   // Interface representing client operations on a SyncPoint, i.e. insert one in
   // the GPU Command Buffer and wait for it.
   class SyncPointClient {
    public:
     SyncPointClient() {}
     virtual uint32 InsertSyncPoint() = 0;
-    virtual void WaitSyncPoint(uint32 sync_point) = 0;
+    virtual void WaitSyncPoint(uint32 sync_point,
+                               const gpu::SyncToken& sync_token) = 0;
 
    protected:
     virtual ~SyncPointClient() {}
 
     DISALLOW_COPY_AND_ASSIGN(SyncPointClient);
   };
 
   // Call prior to CreateFrame to ensure validity of frame configuration. Called
   // automatically by VideoDecoderConfig::IsValidConfig().
   static bool IsValidConfig(VideoPixelFormat format,
@@ skipping 387 matching lines @@
   // CVPixelBuffer, if this frame is wrapping one.
   base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer_;
 #endif
 
   std::vector<base::Closure> done_callbacks_;
 
   base::TimeDelta timestamp_;
 
   base::Lock release_sync_point_lock_;
   uint32 release_sync_point_;
+  gpu::SyncToken release_sync_token_;
 
   VideoFrameMetadata metadata_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_FRAME_H_