Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2302)

Unified Diff: cc/resources/resource_provider.cc

Issue 1387283002: cc: Remove redundant is_overlay arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 083b4868a5de1b2a970a1bdb99dbbc16fbac1e3f..790d0dc7eb1c0e7222c29d62f82d3a96f8c892b7 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -221,6 +221,7 @@ ResourceProvider::Resource::Resource(GLuint texture_id,
allocated(false),
read_lock_fences_enabled(false),
has_shared_bitmap_id(false),
+ bound_to_image(false),
read_lock_fence(NULL),
size(size),
origin(origin),
@@ -521,6 +522,7 @@ ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
base::Bind(&SingleReleaseCallbackImpl::Run,
base::Owned(release_callback_impl.release()));
resource->read_lock_fences_enabled = read_lock_fences_enabled;
+ resource->bound_to_image = mailbox.bound_to_gl_image();
return id;
}
@@ -779,6 +781,11 @@ bool ResourceProvider::CanLockForWrite(ResourceId id) {
!resource->lost && ReadLockFenceHasPassed(resource);
}
+bool ResourceProvider::IsBoundToImage(ResourceId id) {
+ Resource* resource = GetResource(id);
+ return resource->bound_to_image;
+}
+
void ResourceProvider::UnlockForWrite(ResourceProvider::Resource* resource) {
DCHECK(resource->locked_for_write);
DCHECK_EQ(resource->exported_count, 0);
@@ -1220,6 +1227,7 @@ void ResourceProvider::ReceiveFromChild(
it->mailbox_holder.texture_target,
it->mailbox_holder.sync_point);
resource->read_lock_fences_enabled = it->read_lock_fences_enabled;
+ resource->bound_to_image = it->bound_to_gl_image;
}
resource->child_id = child;
// Don't allocate a texture for a child.
@@ -1321,6 +1329,7 @@ void ResourceProvider::TransferResource(GLES2Interface* gl,
resource->size = source->size;
resource->read_lock_fences_enabled = source->read_lock_fences_enabled;
resource->is_repeated = (source->wrap_mode == GL_REPEAT);
+ resource->bound_to_gl_image = source->bound_to_image;
if (source->type == RESOURCE_TYPE_BITMAP) {
resource->mailbox_holder.mailbox = source->shared_bitmap_id;

Powered by Google App Engine
This is Rietveld 408576698