cc: Partial tile update for one-copy raster.

cc/resources/resource_pool.cc

Index: cc/resources/resource_pool.cc
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
index 22847809ba3c196f66df1112d978d56342665b3a..79a5c1afa48305620557b79cf512f52d1b83473b 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -21,7 +21,8 @@ ResourcePool::ResourcePool(ResourceProvider* resource_provider, GLenum target)
 
 ResourcePool::~ResourcePool() {
   while (!busy_resources_.empty()) {
-    DidFinishUsingResource(busy_resources_.front());
+    auto const& front = busy_resources_.front();
+    DidFinishUsingResource(front.resource, front.id);
     busy_resources_.pop_front();
   }
 
@@ -37,7 +38,7 @@ scoped_ptr<ScopedResource> ResourcePool::AcquireResource(
   for (ResourceList::iterator it = unused_resources_.begin();
        it != unused_resources_.end();
        ++it) {
-    ScopedResource* resource = *it;
+    ScopedResource* resource = it->resource;
     DCHECK(resource_provider_->CanLockForWrite(resource->id()));
 
     if (resource->format() != format)
@@ -59,8 +60,31 @@ scoped_ptr<ScopedResource> ResourcePool::AcquireResource(
   return resource.Pass();
 }
 
-void ResourcePool::ReleaseResource(scoped_ptr<ScopedResource> resource) {
-  busy_resources_.push_back(resource.release());
+scoped_ptr<ScopedResource> ResourcePool::TryAcquireOldResource(
+    const gfx::Size& size,
+    ResourceFormat format,
+    uint64_t id) {
+  if (!id)

[reveman, 2015/05/22 17:15:13]

hm, doesn't it make more sense for the caller to check this?

[danakj, 2015/05/26 19:02:52]

Sure, can do if you. It means if (id && TryBlah()) instead of if (TryBlah()) at
each call site, which I thought seemed noisier.

[danakj, 2015/05/26 23:37:34]

Done.

+    return nullptr;
+
+  auto it = std::find_if(unused_resources_.begin(), unused_resources_.end(),
+                         [id](const PoolResource& pr) { return pr.id == id; });
+  if (it == unused_resources_.end())
+    return nullptr;
+
+  ScopedResource* resource = it->resource;
+  DCHECK(resource_provider_->CanLockForWrite(resource->id()));
+  if (resource->format() != format || resource->size() != size)

[reveman, 2015/05/22 17:15:13]

how can a resource with the same ID have a different size or format?

[danakj, 2015/05/26 19:02:52]

I don't know. :) I guess that it can't. I'll DCHECK instead.

[danakj, 2015/05/26 23:37:34]

Done.

+    return nullptr;
+
+  unused_resources_.erase(it);
+  unused_memory_usage_bytes_ -= resource->bytes();
+  return make_scoped_ptr(resource);
+}
+
+void ResourcePool::ReleaseResource(scoped_ptr<ScopedResource> resource,
+                                   uint64_t id) {
+  busy_resources_.push_back(PoolResource(resource.release(), id));
 }
 
 void ResourcePool::SetResourceUsageLimits(size_t max_memory_usage_bytes,
@@ -85,7 +109,7 @@ void ResourcePool::ReduceResourceUsage() {
     // can't be locked for write might also not be truly free-able.
     // We can free the resource here but it doesn't mean that the
     // memory is necessarily returned to the OS.
-    ScopedResource* resource = unused_resources_.front();
+    ScopedResource* resource = unused_resources_.front().resource;
     unused_resources_.pop_front();
     memory_usage_bytes_ -= resource->bytes();
     unused_memory_usage_bytes_ -= resource->bytes();
@@ -108,13 +132,13 @@ void ResourcePool::CheckBusyResources(bool wait_if_needed) {
   ResourceList::iterator it = busy_resources_.begin();
 
   while (it != busy_resources_.end()) {
-    ScopedResource* resource = *it;
+    ScopedResource* resource = it->resource;
 
     if (wait_if_needed)
       resource_provider_->WaitReadLockIfNeeded(resource->id());
 
     if (resource_provider_->CanLockForWrite(resource->id())) {
-      DidFinishUsingResource(resource);
+      DidFinishUsingResource(resource, it->id);
       it = busy_resources_.erase(it);
     } else {
       ++it;
@@ -122,9 +146,10 @@ void ResourcePool::CheckBusyResources(bool wait_if_needed) {
   }
 }
 
-void ResourcePool::DidFinishUsingResource(ScopedResource* resource) {
+void ResourcePool::DidFinishUsingResource(ScopedResource* resource,
+                                          uint64_t id) {
   unused_memory_usage_bytes_ += resource->bytes();
-  unused_resources_.push_back(resource);
+  unused_resources_.push_back(PoolResource(resource, id));
 }
 
 }  // namespace cc