Index: cc/resources/tile_manager.h |
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h |
index 6f579f9fb1c9dde8baa82cd233604482f0e00f5f..8f95c54689adfe42bb83543717348d208aa545b9 100644 |
--- a/cc/resources/tile_manager.h |
+++ b/cc/resources/tile_manager.h |
@@ -188,26 +188,7 @@ class CC_EXPORT TileManager : public RasterizerClient, |
void AssignGpuMemoryToTiles(TileVector* tiles_that_need_to_be_rasterized); |
private: |
- class MemoryUsage { |
- public: |
- MemoryUsage(); |
- MemoryUsage(int64 memory_bytes, int resource_count); |
- |
- static MemoryUsage FromConfig(const gfx::Size& size, ResourceFormat format); |
- static MemoryUsage FromTile(const Tile* tile); |
- |
- MemoryUsage& operator+=(const MemoryUsage& other); |
- MemoryUsage& operator-=(const MemoryUsage& other); |
- MemoryUsage operator-(const MemoryUsage& other); |
- |
- bool Exceeds(const MemoryUsage& limit) const; |
- int64 memory_bytes() const { return memory_bytes_; } |
- |
- private: |
- int64 memory_bytes_; |
- int resource_count_; |
- }; |
- |
+ using MemoryUsage = int64_t; |
void OnImageDecodeTaskCompleted(int layer_id, |
SkPixelRef* pixel_ref, |
bool was_canceled); |
@@ -223,15 +204,18 @@ class CC_EXPORT TileManager : public RasterizerClient, |
scoped_refptr<RasterTask> CreateRasterTask(Tile* tile); |
void RebuildEvictionQueueIfNeeded(); |
- bool FreeTileResourcesUntilUsageIsWithinLimit(const MemoryUsage& limit, |
+ bool FreeTileResourcesUntilUsageIsWithinLimit(MemoryUsage limit, |
MemoryUsage* usage); |
bool FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit( |
- const MemoryUsage& limit, |
+ MemoryUsage limit, |
const TilePriority& oother_priority, |
MemoryUsage* usage); |
bool TilePriorityViolatesMemoryPolicy(const TilePriority& priority); |
bool IsReadyToActivate() const; |
void CheckIfReadyToActivate(); |
+ MemoryUsage MemoryUsageFromConfig(const gfx::Size& size, |
+ ResourceFormat format); |
+ MemoryUsage MemoryUsageFromTile(const Tile* tile); |
TileManagerClient* client_; |
scoped_refptr<base::SequencedTaskRunner> task_runner_; |