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

chromecast/renderer/media/hole_frame_factory.cc

 // Copyright 2015 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.
 
 #include "chromecast/renderer/media/hole_frame_factory.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "media/base/video_frame.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 namespace chromecast {
 namespace media {
 
 HoleFrameFactory::HoleFrameFactory(
     ::media::GpuVideoAcceleratorFactories* gpu_factories)
-    : gpu_factories_(gpu_factories), texture_(0), image_id_(0), sync_point_(0) {
+    : gpu_factories_(gpu_factories), texture_(0), image_id_(0) {
   if (gpu_factories_) {
     scoped_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock> lock(
         gpu_factories_->GetGLContextLock());
     CHECK(lock);
     gpu::gles2::GLES2Interface* gl = lock->ContextGL();
 
     gl->GenTextures(1, &texture_);
     gl->BindTexture(GL_TEXTURE_2D, texture_);
     image_id_ = gl->CreateGpuMemoryBufferImageCHROMIUM(1, 1, GL_RGBA,
                                                        GL_READ_WRITE_CHROMIUM);
     gl->BindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_);
 
     gl->GenMailboxCHROMIUM(mailbox_.name);
     gl->ProduceTextureDirectCHROMIUM(texture_, GL_TEXTURE_2D, mailbox_.name);
 
-    sync_point_ = gl->InsertSyncPointCHROMIUM();
+    sync_token_ = gpu::SyncToken(gl->InsertSyncPointCHROMIUM());
   }
 }
 
 HoleFrameFactory::~HoleFrameFactory() {
   if (texture_) {
     scoped_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock> lock(
         gpu_factories_->GetGLContextLock());
     CHECK(lock);
     gpu::gles2::GLES2Interface* gl = lock->ContextGL();
     gl->BindTexture(GL_TEXTURE_2D, texture_);
     gl->ReleaseTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_);
     gl->DeleteTextures(1, &texture_);
     gl->DestroyImageCHROMIUM(image_id_);
   }
 }
 
 scoped_refptr<::media::VideoFrame> HoleFrameFactory::CreateHoleFrame(
     const gfx::Size& size) {
   if (texture_) {
     scoped_refptr<::media::VideoFrame> frame =
         ::media::VideoFrame::WrapNativeTexture(
             ::media::PIXEL_FORMAT_XRGB,
-            gpu::MailboxHolder(mailbox_, GL_TEXTURE_2D, sync_point_),
+            gpu::MailboxHolder(mailbox_, sync_token_, GL_TEXTURE_2D),
             ::media::VideoFrame::ReleaseMailboxCB(),
             size,                // coded_size
             gfx::Rect(size),     // visible rect
             size,                // natural size
             base::TimeDelta());  // timestamp
     frame->metadata()->SetBoolean(::media::VideoFrameMetadata::ALLOW_OVERLAY,
                                   true);
     return frame;
   } else {
     // This case is needed for audio-only devices.
     return ::media::VideoFrame::CreateBlackFrame(gfx::Size(1, 1));
   }
 }
 
 }  // namespace media
 }  // namespace chromecast