| Index: cc/resources/resource_pool.h
|
| diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h
|
| index c1db254e052e78627fdcb791aa01f528a69b1177..b926c41362f3117c44224f3316415ad37152e444 100644
|
| --- a/cc/resources/resource_pool.h
|
| +++ b/cc/resources/resource_pool.h
|
| @@ -21,20 +21,18 @@ namespace cc {
|
|
|
| class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
|
| public:
|
| - static scoped_ptr<ResourcePool> Create(
|
| + static scoped_ptr<ResourcePool> CreateForImageTextureTarget(
|
| ResourceProvider* resource_provider,
|
| base::SingleThreadTaskRunner* task_runner) {
|
| return make_scoped_ptr(
|
| - new ResourcePool(resource_provider, task_runner, 0 /* target */));
|
| + new ResourcePool(resource_provider, task_runner, true));
|
| }
|
|
|
| static scoped_ptr<ResourcePool> Create(
|
| ResourceProvider* resource_provider,
|
| - base::SingleThreadTaskRunner* task_runner,
|
| - GLenum target) {
|
| - DCHECK_NE(0u, target);
|
| + base::SingleThreadTaskRunner* task_runner) {
|
| return make_scoped_ptr(
|
| - new ResourcePool(resource_provider, task_runner, target));
|
| + new ResourcePool(resource_provider, task_runner, false));
|
| }
|
|
|
| ~ResourcePool() override;
|
| @@ -72,7 +70,7 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
|
| protected:
|
| ResourcePool(ResourceProvider* resource_provider,
|
| base::SingleThreadTaskRunner* task_runner,
|
| - GLenum target);
|
| + bool use_image_texture_target);
|
|
|
| bool ResourceUsageTooHigh();
|
|
|
| @@ -111,7 +109,7 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
|
| base::TimeTicks GetUsageTimeForLRUResource() const;
|
|
|
| ResourceProvider* resource_provider_;
|
| - const GLenum target_;
|
| + bool use_image_texture_target_;
|
| size_t max_memory_usage_bytes_;
|
| size_t max_resource_count_;
|
| size_t in_use_memory_usage_bytes_;
|
|
|