Index: cc/resources/video_resource_updater.cc |
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc |
index 568c6f2b8bc6f320a95ec1e533cd30d7d1e44cd6..673c6095d09a8914ad91c6f197c5f48e26067d0a 100644 |
--- a/cc/resources/video_resource_updater.cc |
+++ b/cc/resources/video_resource_updater.cc |
@@ -226,7 +226,8 @@ VideoResourceUpdater::AllocateResource(const gfx::Size& plane_size, |
gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL(); |
gl->GenMailboxCHROMIUM(mailbox.name); |
- ResourceProvider::ScopedWriteLockGL lock(resource_provider_, resource_id); |
+ ResourceProvider::ScopedWriteLockGL lock(resource_provider_, resource_id, |
+ false); |
gl->ProduceTextureDirectCHROMIUM( |
lock.texture_id(), |
resource_provider_->GetResourceTextureTarget(resource_id), |
@@ -636,16 +637,14 @@ void VideoResourceUpdater::CopyPlaneTexture( |
++resource->ref_count; |
ResourceProvider::ScopedWriteLockGL lock(resource_provider_, |
- resource->resource_id); |
- uint32_t texture_id = lock.texture_id(); |
- |
+ resource->resource_id, false); |
DCHECK_EQ(resource_provider_->GetResourceTextureTarget(resource->resource_id), |
(GLenum)GL_TEXTURE_2D); |
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, texture_id, 0, 0, 0, 0, |
+ gl->CopySubTextureCHROMIUM(src_texture_id, lock.texture_id(), 0, 0, 0, 0, |
output_plane_resource_size.width(), |
output_plane_resource_size.height(), false, false, |
false); |