Pass correct texture hint for GPU 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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 16 matching lines @@
                                public base::MemoryCoordinatorClient {
  public:
   // Delay before a resource is considered expired.
   static base::TimeDelta kDefaultExpirationDelay;
 
   static std::unique_ptr<ResourcePool> CreateForGpuMemoryBufferResources(
       ResourceProvider* resource_provider,
       base::SingleThreadTaskRunner* task_runner,
       gfx::BufferUsage usage,
       const base::TimeDelta& expiration_delay) {
-    std::unique_ptr<ResourcePool> pool(new ResourcePool(
-        resource_provider, task_runner, true, expiration_delay));
-    pool->usage_ = usage;
-    return pool;
+    return base::WrapUnique(new ResourcePool(resource_provider, task_runner,
+                                             usage, expiration_delay));
   }
 
   static std::unique_ptr<ResourcePool> Create(
       ResourceProvider* resource_provider,
       base::SingleThreadTaskRunner* task_runner,
+      ResourceProvider::TextureHint hint,
       const base::TimeDelta& expiration_delay) {
     return base::WrapUnique(new ResourcePool(resource_provider, task_runner,
-                                             false, expiration_delay));
+                                             hint, expiration_delay));
   }
 
   ~ResourcePool() override;
 
   // Tries to reuse a resource. If none are available, makes a new one.
   Resource* AcquireResource(const gfx::Size& size,
                             ResourceFormat format,
                             const gfx::ColorSpace& color_space);
 
   // Tries to acquire the resource with |previous_content_id| for us in partial
@@ skipping 33 matching lines @@
     return total_memory_usage_bytes_;
   }
   size_t GetTotalResourceCountForTesting() const {
     return total_resource_count_;
   }
   size_t GetBusyResourceCountForTesting() const {
     return busy_resources_.size();
   }
 
  protected:
+  // Constructor for creating GPU memory buffer resources.
   ResourcePool(ResourceProvider* resource_provider,
                base::SingleThreadTaskRunner* task_runner,
-               bool use_gpu_memory_buffers,
+               gfx::BufferUsage usage,
+               const base::TimeDelta& expiration_delay);
+
+  // Constructor for creating standard resources.
+  ResourcePool(ResourceProvider* resource_provider,
+               base::SingleThreadTaskRunner* task_runner,
+               ResourceProvider::TextureHint hint,
                const base::TimeDelta& expiration_delay);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourcePoolTest, ReuseResource);
   class PoolResource : public ScopedResource {
    public:
     static std::unique_ptr<PoolResource> Create(
         ResourceProvider* resource_provider) {
       return base::WrapUnique(new PoolResource(resource_provider));
     }
@@ skipping 37 matching lines @@
       uint64_t new_content_id,
       const gfx::Rect& new_invalidated_rect);
 
   // Functions which manage periodic eviction of expired resources.
   void ScheduleEvictExpiredResourcesIn(base::TimeDelta time_from_now);
   void EvictExpiredResources();
   void EvictResourcesNotUsedSince(base::TimeTicks time_limit);
   bool HasEvictableResources() const;
   base::TimeTicks GetUsageTimeForLRUResource() const;
 
-  ResourceProvider* resource_provider_;
-  bool use_gpu_memory_buffers_;
-  gfx::BufferUsage usage_;
-  size_t max_memory_usage_bytes_;
-  size_t max_resource_count_;
-  size_t in_use_memory_usage_bytes_;
-  size_t total_memory_usage_bytes_;
-  size_t total_resource_count_;
+  ResourceProvider* resource_provider_ = nullptr;
+  bool use_gpu_memory_buffers_ = false;
+  gfx::BufferUsage usage_ = gfx::BufferUsage::GPU_READ_CPU_READ_WRITE;
+  ResourceProvider::TextureHint hint_ = ResourceProvider::TEXTURE_HINT_DEFAULT;
+  size_t max_memory_usage_bytes_ = 0;
+  size_t max_resource_count_ = 0;
+  size_t in_use_memory_usage_bytes_ = 0;
+  size_t total_memory_usage_bytes_ = 0;
+  size_t total_resource_count_ = 0;
 
   // Holds most recently used resources at the front of the queue.
   using ResourceDeque = std::deque<std::unique_ptr<PoolResource>>;
   ResourceDeque unused_resources_;
   ResourceDeque busy_resources_;
 
   using InUseResourceMap = std::map<ResourceId, std::unique_ptr<PoolResource>>;
   InUseResourceMap in_use_resources_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  bool evict_expired_resources_pending_;
+  bool evict_expired_resources_pending_ = false;
   const base::TimeDelta resource_expiration_delay_;
 
   base::WeakPtrFactory<ResourcePool> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_POOL_H_