| Index: cc/resources/video_resource_updater.cc
|
| diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
|
| index ae02820d071d3d7042ab4d0f15ba50caa59da656..319e82eca7fc1d990f50b3f09ba4cf4dec4ca811 100644
|
| --- a/cc/resources/video_resource_updater.cc
|
| +++ b/cc/resources/video_resource_updater.cc
|
| @@ -191,8 +191,7 @@
|
| gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
|
|
|
| gl->GenMailboxCHROMIUM(mailbox.name);
|
| - ResourceProvider::ScopedWriteLockGL lock(resource_provider_, resource_id,
|
| - false);
|
| + ResourceProvider::ScopedWriteLockGL lock(resource_provider_, resource_id);
|
| gl->ProduceTextureDirectCHROMIUM(
|
| lock.texture_id(),
|
| resource_provider_->GetResourceTextureTarget(resource_id),
|
| @@ -585,7 +584,9 @@
|
| resource->add_ref();
|
|
|
| ResourceProvider::ScopedWriteLockGL lock(resource_provider_,
|
| - resource->resource_id(), false);
|
| + resource->resource_id());
|
| + uint32_t texture_id = lock.texture_id();
|
| +
|
| DCHECK_EQ(
|
| resource_provider_->GetResourceTextureTarget(resource->resource_id()),
|
| (GLenum)GL_TEXTURE_2D);
|
| @@ -593,7 +594,7 @@
|
| gl->WaitSyncTokenCHROMIUM(mailbox_holder.sync_token.GetConstData());
|
| uint32_t src_texture_id = gl->CreateAndConsumeTextureCHROMIUM(
|
| mailbox_holder.texture_target, mailbox_holder.mailbox.name);
|
| - gl->CopySubTextureCHROMIUM(src_texture_id, lock.texture_id(), 0, 0, 0, 0,
|
| + gl->CopySubTextureCHROMIUM(src_texture_id, texture_id, 0, 0, 0, 0,
|
| output_plane_resource_size.width(),
|
| output_plane_resource_size.height(), false, false,
|
| false);
|
|
|