cc: Bump up pending tree now tiles order for smoothness mode.

cc/resources/tile_manager.cc

 // Copyright 2012 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/tile_manager.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
@@ skipping 482 matching lines @@
 bool TileManager::FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit(
     const MemoryUsage& limit,
     const TilePriority& other_priority,
     MemoryUsage* usage) {
   while (usage->Exceeds(limit)) {
     RebuildEvictionQueueIfNeeded();
     if (eviction_priority_queue_.IsEmpty())
       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);
     eviction_priority_queue_.Pop();
   }
   return true;
 }
 
 bool TileManager::TilePriorityViolatesMemoryPolicy(
     const TilePriority& priority) {
@@ skipping 36 matching lines @@
   MemoryUsage memory_usage(resource_pool_->acquired_memory_usage_bytes(),
                            resource_pool_->acquired_resource_count());
 
   eviction_priority_queue_is_up_to_date_ = false;
   raster_priority_queue_.Reset();
   client_->BuildRasterQueue(&raster_priority_queue_,
                             global_state_.tree_priority);
 
   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;
 
     // We won't be able to schedule this tile, so break out early.
     if (tiles_that_need_to_be_rasterized->size() >=
         kScheduledRasterTasksLimit) {
       all_tiles_that_need_to_be_rasterized_are_scheduled_ = false;
       break;
     }
@@ skipping 333 matching lines @@
   result -= other;
   return result;
 }
 
 bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const {
   return memory_bytes_ > limit.memory_bytes_ ||
          resource_count_ > limit.resource_count_;
 }
 
 }  // namespace cc