| Index: cc/resources/resource_pool.h
|
| diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h
|
| index 378ce0168ddbb72c38323df81cd6795d07426ba1..a1bd9d696cb14933dcdd1d63d5d3e4aef5117dd1 100644
|
| --- a/cc/resources/resource_pool.h
|
| +++ b/cc/resources/resource_pool.h
|
| @@ -85,6 +85,9 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider,
|
| bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
|
| base::trace_event::ProcessMemoryDump* pmd) override;
|
|
|
| + // Overriden from base::MemoryCoordinatorClient.
|
| + void OnMemoryStateChange(base::MemoryState state) override;
|
| +
|
| size_t GetTotalMemoryUsageForTesting() const {
|
| return total_memory_usage_bytes_;
|
| }
|
| @@ -158,9 +161,6 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider,
|
| bool HasEvictableResources() const;
|
| base::TimeTicks GetUsageTimeForLRUResource() const;
|
|
|
| - // Overriden from base::MemoryCoordinatorClient.
|
| - void OnMemoryStateChange(base::MemoryState state) override;
|
| -
|
| ResourceProvider* resource_provider_;
|
| bool use_gpu_memory_buffers_;
|
| gfx::BufferUsage usage_;
|
|
|