| Index: content/renderer/media/renderer_gpu_video_accelerator_factories.cc
|
| diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
|
| index 5cd32b886f7355d935ffe3005d4dc961c97faa37..ba3ed71655fb6a8e8e109a5e6ca80967533c6b91 100644
|
| --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
|
| +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
|
| @@ -164,14 +164,16 @@ void RendererGpuVideoAcceleratorFactories::DeleteTexture(uint32 texture_id) {
|
| DCHECK_EQ(gles2->GetError(), static_cast<GLenum>(GL_NO_ERROR));
|
| }
|
|
|
| -void RendererGpuVideoAcceleratorFactories::WaitSyncPoint(uint32 sync_point) {
|
| +void RendererGpuVideoAcceleratorFactories::WaitSyncPoint(
|
| + uint32 sync_point,
|
| + const gpu::SyncToken& sync_token) {
|
| DCHECK(task_runner_->BelongsToCurrentThread());
|
| if (CheckContextLost())
|
| return;
|
|
|
| cc::ContextProvider::ScopedContextLock lock(context_provider_);
|
| gpu::gles2::GLES2Interface* gles2 = lock.ContextGL();
|
| - gles2->WaitSyncPointCHROMIUM(sync_point);
|
| + gles2->WaitSyncPointCHROMIUM(sync_point, sync_token.GetConstData());
|
|
|
| // Callers expect the WaitSyncPoint to affect the next IPCs. Make sure to
|
| // flush the command buffers to ensure that.
|
|
|