cc: Partial tile update for one-copy raster.

cc/resources/resource_pool.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_RESOURCE_POOL_H_
 #define CC_RESOURCES_RESOURCE_POOL_H_
 
-#include <list>
+#include <deque>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/renderer.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_format.h"
 
 namespace cc {
 class ScopedResource;
 
 class CC_EXPORT ResourcePool {
  public:
   static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
                                          GLenum target) {
     return make_scoped_ptr(new ResourcePool(resource_provider, target));
   }
 
   virtual ~ResourcePool();
 
   scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
                                              ResourceFormat format);
-  void ReleaseResource(scoped_ptr<ScopedResource>);
+  scoped_ptr<ScopedResource> TryAcquireResourceWithContentId(
+      const gfx::Size& size,
+      ResourceFormat format,
+      uint64 content_id);

[reveman, 2015/05/28 05:07:25]

As we don't have two different versions of ReleaseResource, should we also use a
single version of AcquireResource with an optional content_id parameter?

[danakj, 2015/05/28 18:54:47]

I don't think so. That would complicate the caller code. It would need another
bool outparam for if it's the old resource found or not.

+  void ReleaseResource(scoped_ptr<ScopedResource> resource,
+                       uint64_t content_id);
 
   void SetResourceUsageLimits(size_t max_memory_usage_bytes,
                               size_t max_unused_memory_usage_bytes,
                               size_t max_resource_count);
 
   void ReduceResourceUsage();
   // This might block if |wait_if_needed| is true and one of the currently
   // busy resources has a read lock fence that needs to be waited upon before
   // it can be locked for write again.
   void CheckBusyResources(bool wait_if_needed);
 
   size_t total_memory_usage_bytes() const { return memory_usage_bytes_; }
   size_t acquired_memory_usage_bytes() const {
     return memory_usage_bytes_ - unused_memory_usage_bytes_;
   }
   size_t total_resource_count() const { return resource_count_; }
   size_t acquired_resource_count() const {
     return resource_count_ - unused_resources_.size();
   }
   size_t busy_resource_count() const { return busy_resources_.size(); }
 
  protected:
   ResourcePool(ResourceProvider* resource_provider, GLenum target);
 
   bool ResourceUsageTooHigh();
 
  private:
-  void DidFinishUsingResource(ScopedResource* resource);
+  void DidFinishUsingResource(ScopedResource* resource, uint64_t content_id);
 
   ResourceProvider* resource_provider_;
   const GLenum target_;
   size_t max_memory_usage_bytes_;
   size_t max_unused_memory_usage_bytes_;
   size_t max_resource_count_;
   size_t memory_usage_bytes_;
   size_t unused_memory_usage_bytes_;
   size_t resource_count_;
 
-  typedef std::list<ScopedResource*> ResourceList;
+  struct PoolResource {
+    PoolResource(ScopedResource* resource, uint64_t content_id)
+        : resource(resource), content_id(content_id) {}
+    ScopedResource* resource;
+    uint64_t content_id;
+  };
+  typedef std::deque<PoolResource> ResourceList;

[reveman, 2015/05/28 05:07:25]

I would still prefer if this list -> deque change was done in a separate patch.

[danakj, 2015/05/28 18:54:47]

It seems I'm no longer using deque APIs in this CL. Removed it.

   ResourceList unused_resources_;
   ResourceList busy_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_POOL_H_