Index: cc/resources/tile_manager.cc |
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc |
index c9fab0fc06034c14f840772b76aadcf7972a9fad..d7a61c7478949e0b28ab91459ccd79b3ef1dabc3 100644 |
--- a/cc/resources/tile_manager.cc |
+++ b/cc/resources/tile_manager.cc |
@@ -500,10 +500,8 @@ bool TileManager::FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit( |
return false; |
Tile* tile = eviction_priority_queue_.Top(); |
- if (!other_priority.IsHigherPriorityThan( |
- tile->priority_for_tree_priority(global_state_.tree_priority))) { |
+ if (!other_priority.IsHigherPriorityThan(tile->combined_priority())) |
return false; |
- } |
*usage -= MemoryUsage::FromTile(tile); |
FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(tile); |
@@ -560,8 +558,7 @@ void TileManager::AssignGpuMemoryToTiles( |
while (!raster_priority_queue_.IsEmpty()) { |
Tile* tile = raster_priority_queue_.Top(); |
- TilePriority priority = |
- tile->priority_for_tree_priority(global_state_.tree_priority); |
+ TilePriority priority = tile->combined_priority(); |
if (TilePriorityViolatesMemoryPolicy(priority)) |
break; |