cc: Switch tiling set eviction queue to consider combined priority.

cc/resources/eviction_tile_priority_queue.cc

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 503b26d347fd5769005e58afbb4de912f3178e1c..d308a769dae90f5c9d9f6706cd6f8fab05e27b98 100644
--- a/cc/resources/eviction_tile_priority_queue.cc
+++ b/cc/resources/eviction_tile_priority_queue.cc
@@ -89,11 +89,8 @@ void EvictionTilePriorityQueue::Build(
 
   for (std::vector<PictureLayerImpl::Pair>::const_iterator it =
            paired_layers.begin();
-       it != paired_layers.end();
-       ++it) {

[vmpstr, 2015/04/02 17:30:29]

nit: keep the braces, since the for loop is two lines. Or change the for loop to
be range based for with const auto&

[USE eero AT chromium.org, 2015/04/07 13:17:07]

Done.

-    paired_queues_.push_back(
-        make_scoped_ptr(new PairedTilingSetQueue(*it, tree_priority_)));
-  }
+       it != paired_layers.end(); ++it)
+    paired_queues_.push_back(make_scoped_ptr(new PairedTilingSetQueue(*it)));
 
   paired_queues_.make_heap(EvictionOrderComparator(tree_priority_));
 }
@@ -120,17 +117,16 @@ EvictionTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue() {
 }
 
 EvictionTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue(
-    const PictureLayerImpl::Pair& layer_pair,
-    TreePriority tree_priority) {
+    const PictureLayerImpl::Pair& layer_pair) {
   bool skip_shared_out_of_order_tiles = layer_pair.active && layer_pair.pending;
   if (layer_pair.active) {
     active_queue = make_scoped_ptr(new TilingSetEvictionQueue(
-        layer_pair.active->picture_layer_tiling_set(), tree_priority,
+        layer_pair.active->picture_layer_tiling_set(),
         skip_shared_out_of_order_tiles));
   }
   if (layer_pair.pending) {
     pending_queue = make_scoped_ptr(new TilingSetEvictionQueue(
-        layer_pair.pending->picture_layer_tiling_set(), tree_priority,
+        layer_pair.pending->picture_layer_tiling_set(),
         skip_shared_out_of_order_tiles));
   }
 }