Index: cc/resources/eviction_tile_priority_queue.cc |
diff --git a/cc/resources/eviction_tile_priority_queue.cc b/cc/resources/eviction_tile_priority_queue.cc |
index 9f05e816764613ee7424cff8bff3d6f6376e8430..eb68ff10b13a7e903865535b61472022d5a20645 100644 |
--- a/cc/resources/eviction_tile_priority_queue.cc |
+++ b/cc/resources/eviction_tile_priority_queue.cc |
@@ -213,6 +213,16 @@ EvictionTilePriorityQueue::PairedPictureLayerQueue::NextTileIteratorTree( |
const TilePriority& pending_priority = |
pending_tile->priority_for_tree_priority(tree_priority); |
+ if (active_priority.priority_bin == pending_priority.priority_bin) { |
vmpstr
2014/11/19 16:47:58
*
|
+ if (active_tile->required_for_activation()) { |
+ if (!pending_tile->required_for_activation()) |
+ return PENDING_TREE; |
+ } else { |
+ if (pending_tile->required_for_activation()) |
+ return ACTIVE_TREE; |
+ } |
+ } |
+ |
if (pending_priority.IsHigherPriorityThan(active_priority)) |
return ACTIVE_TREE; |
return PENDING_TREE; |