Update from https://crrev.com/311145

cc/resources/eviction_tile_priority_queue.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/eviction_tile_priority_queue.h"
 
 namespace cc {
 
 namespace {
 
@@ skipping 110 matching lines @@
   paired_queue->Pop(tree_priority_);
   paired_queues_.push_heap(EvictionOrderComparator(tree_priority_));
 }
 
 EvictionTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue() {
 }
 
 EvictionTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue(
     const PictureLayerImpl::Pair& layer_pair,
     TreePriority tree_priority) {
-  if (layer_pair.active)
-    active_queue = layer_pair.active->CreateEvictionQueue(tree_priority);
-  if (layer_pair.pending)
-    pending_queue = layer_pair.pending->CreateEvictionQueue(tree_priority);
+  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,
+        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,
+        skip_shared_out_of_order_tiles));
+  }
 }
 
 EvictionTilePriorityQueue::PairedTilingSetQueue::~PairedTilingSetQueue() {
 }
 
 bool EvictionTilePriorityQueue::PairedTilingSetQueue::IsEmpty() const {
   return (!active_queue || active_queue->IsEmpty()) &&
          (!pending_queue || pending_queue->IsEmpty());
 }
 
@@ skipping 57 matching lines @@
     return active_tile->required_for_activation() ? PENDING_TREE : ACTIVE_TREE;
   }
 
   // Return tile with a lower priority.
   if (pending_priority.IsHigherPriorityThan(active_priority))
     return ACTIVE_TREE;
   return PENDING_TREE;
 }
 
 }  // namespace cc