Index: cc/resources/resource_provider.cc |
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc |
index 079d034e09e6dee299b1897c2e44153deff15086..528779e196a85757a2e11382014386a478cfae8b 100644 |
--- a/cc/resources/resource_provider.cc |
+++ b/cc/resources/resource_provider.cc |
@@ -550,7 +550,8 @@ ResourceId ResourceProvider::CreateResourceFromIOSurface( |
ResourceId ResourceProvider::CreateResourceFromTextureMailbox( |
const TextureMailbox& mailbox, |
- scoped_ptr<SingleReleaseCallbackImpl> release_callback_impl) { |
+ scoped_ptr<SingleReleaseCallbackImpl> release_callback_impl, |
+ bool read_lock_fences_enabled) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// Just store the information. Mailbox will be consumed in LockForRead(). |
ResourceId id = next_id_++; |
@@ -575,9 +576,17 @@ ResourceId ResourceProvider::CreateResourceFromTextureMailbox( |
resource->release_callback_impl = |
base::Bind(&SingleReleaseCallbackImpl::Run, |
base::Owned(release_callback_impl.release())); |
+ resource->read_lock_fences_enabled = read_lock_fences_enabled; |
return id; |
} |
+ResourceId ResourceProvider::CreateResourceFromTextureMailbox( |
+ const TextureMailbox& mailbox, |
+ scoped_ptr<SingleReleaseCallbackImpl> release_callback_impl) { |
+ return CreateResourceFromTextureMailbox(mailbox, release_callback_impl.Pass(), |
+ false); |
+} |
+ |
void ResourceProvider::DeleteResource(ResourceId id) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
ResourceMap::iterator it = resources_.find(id); |