Index: media/video/gpu_memory_buffer_video_frame_pool.cc |
diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc |
index d1e3a3deeefd2abf1bf70fa9913c780bb5a061e7..a8b4c8a18722c6947c37fce4f8713b374a835306 100644 |
--- a/media/video/gpu_memory_buffer_video_frame_pool.cc |
+++ b/media/video/gpu_memory_buffer_video_frame_pool.cc |
@@ -124,7 +124,8 @@ class GpuMemoryBufferVideoFramePool::PoolImpl |
// longer referenced. |
// This could be called by any thread. |
void MailboxHoldersReleased(FrameResources* frame_resources, |
- uint32 sync_point); |
+ uint32 sync_point, |
+ const gpu::SyncToken& sync_token); |
// Return frame resources to the pool. This has to be called on the thread |
// where |media_task_runner_| is current. |
@@ -554,8 +555,8 @@ void GpuMemoryBufferVideoFramePool::PoolImpl:: |
} |
if (plane_resource.image_id) |
gles2->BindTexImage2DCHROMIUM(texture_target_, plane_resource.image_id); |
- mailbox_holders[i] = |
- gpu::MailboxHolder(plane_resource.mailbox, texture_target_, 0); |
+ mailbox_holders[i] = gpu::MailboxHolder(plane_resource.mailbox, 0, |
+ gpu::SyncToken(), texture_target_); |
} |
// Insert a sync_point, this is needed to make sure that the textures the |
@@ -692,7 +693,8 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::DeleteFrameResources( |
// Called when a VideoFrame is no longer references. |
void GpuMemoryBufferVideoFramePool::PoolImpl::MailboxHoldersReleased( |
FrameResources* frame_resources, |
- uint32 sync_point) { |
+ uint32 sync_point, |
+ const gpu::SyncToken& sync_token) { |
// Return the resource on the media thread. |
media_task_runner_->PostTask( |
FROM_HERE, |