Refactoring for merging ManagedTileState into Tile.

cc/resources/tiling_set_eviction_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 <utility>
 
 #include "cc/resources/tiling_set_eviction_queue.h"
 
 namespace cc {
 
@@ skipping 72 matching lines @@
   // the current tile.
 
   bool required_for_activation =
       processing_tiling_with_required_for_activation_tiles_;
 
   for (;;) {
     while (spiral_iterator_) {
       std::pair<int, int> next_index = spiral_iterator_.index();
       Tile* tile = current_tiling_->TileAt(next_index.first, next_index.second);
       ++spiral_iterator_;
-      if (!tile || !tile->HasResources())
+      if (!tile || !tile->HasResource())
         continue;
       if (skip_all_shared_tiles_ && tile->is_shared())
         continue;
       current_tiling_->UpdateTileAndTwinPriority(tile);
       if (skip_shared_out_of_order_tiles_ && IsSharedOutOfOrderTile(tile))
         continue;
       if (tile->required_for_activation() != required_for_activation)
         continue;
       current_eviction_tile_ = tile;
       return true;
@@ skipping 12 matching lines @@
     }
     break;
   }
 
   TilePriority::PriorityBin max_tile_priority_bin =
       current_tiling_->client_->GetMaxTilePriorityBin();
   while (visible_iterator_) {
     std::pair<int, int> next_index = visible_iterator_.index();
     Tile* tile = current_tiling_->TileAt(next_index.first, next_index.second);
     ++visible_iterator_;
-    if (!tile || !tile->HasResources())
+    if (!tile || !tile->HasResource())
       continue;
     if (skip_all_shared_tiles_ && tile->is_shared())
       continue;
     // If the max tile priority is not NOW, updated priorities for tiles
     // returned by the visible iterator will not have NOW (but EVENTUALLY)
     // priority bin and cannot therefore be required for activation tiles nor
     // occluded NOW tiles in the current tiling.
     if (max_tile_priority_bin <= TilePriority::NOW) {
       // If the current tiling is a pending tree tiling, required for
       // activation tiles can be detected without updating tile priorities.
@@ skipping 18 matching lines @@
     return true;
   }
 
   while (!unoccluded_now_tiles_.empty()) {
     // All (unoccluded) NOW tiles have the same priority bin (NOW) and the same
     // distance to visible (0.0), so it does not matter that tiles are popped
     // in reversed (FILO) order.
     Tile* tile = unoccluded_now_tiles_.back();
     unoccluded_now_tiles_.pop_back();
     DCHECK(tile);
-    if (!tile->HasResources())
+    if (!tile->HasResource())
       continue;
     current_tiling_->UpdateTileAndTwinPriority(tile);
     if (skip_shared_out_of_order_tiles_ && IsSharedOutOfOrderTile(tile))
       continue;
     if (tile->required_for_activation() != required_for_activation)
       continue;
     current_eviction_tile_ = tile;
     return true;
   }
 
@@ skipping 223 matching lines @@
           tiling_set_->client()->GetPendingOrActiveTwinTiling(tiling);
       if (pending_tiling && pending_tiling->resolution() == HIGH_RESOLUTION)
         return i;
     }
   }
 
   return num_tilings;
 }
 
 }  // namespace cc