cc: Keep tile eviction prioritization consistent with raster priorities.

cc/tiles/eviction_tile_priority_queue.cc

Index: cc/tiles/eviction_tile_priority_queue.cc
diff --git a/cc/tiles/eviction_tile_priority_queue.cc b/cc/tiles/eviction_tile_priority_queue.cc
index df75f453bb5a330cb75af77373fab774ec76b8f6..44066bbf47c3f8acfe8b788db16f256554a5b427 100644
--- a/cc/tiles/eviction_tile_priority_queue.cc
+++ b/cc/tiles/eviction_tile_priority_queue.cc
@@ -15,11 +15,11 @@ class EvictionOrderComparator {
   explicit EvictionOrderComparator(TreePriority tree_priority)
       : tree_priority_(tree_priority) {}
 
+  // Note that in this function, we have to return true if and only if
+  // b is strictly lower priority than a.
   bool operator()(
       const std::unique_ptr<TilingSetEvictionQueue>& a_queue,
       const std::unique_ptr<TilingSetEvictionQueue>& b_queue) const {
-    // Note that in this function, we have to return true if and only if
-    // b is strictly lower priority than a.
     const PrioritizedTile& a_tile = a_queue->Top();
     const PrioritizedTile& b_tile = b_queue->Top();
 
@@ -27,6 +27,13 @@ class EvictionOrderComparator {
     const TilePriority& b_priority = b_tile.priority();
     bool prioritize_low_res = tree_priority_ == SMOOTHNESS_TAKES_PRIORITY;
 
+    // If the priority bin is the same but one of the tiles is from a
+    // non-drawing layer, then the drawing layer has a higher priority.
+    if (b_priority.priority_bin == a_priority.priority_bin &&
+        b_queue->is_drawing_layer() != a_queue->is_drawing_layer()) {
+      return a_queue->is_drawing_layer();
+    }
+
     // If the priority bin differs, b is lower priority if it has the higher
     // priority bin.
     if (a_priority.priority_bin != b_priority.priority_bin)
@@ -73,7 +80,8 @@ void CreateTilingSetEvictionQueues(
   for (auto* layer : layers) {
     std::unique_ptr<TilingSetEvictionQueue> tiling_set_queue =
         base::MakeUnique<TilingSetEvictionQueue>(
-            layer->picture_layer_tiling_set());
+            layer->picture_layer_tiling_set(),
+            layer->contributes_to_drawn_render_surface());
     // Queues will only contain non empty tiling sets.
     if (!tiling_set_queue->IsEmpty())
       queues->push_back(std::move(tiling_set_queue));