cc: Separate the priority from the tile and put in new PrioritizedTile

cc/resources/raster_tile_priority_queue_all.cc

 // Copyright 2015 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/raster_tile_priority_queue_all.h"
 
 #include "cc/resources/tiling_set_raster_queue_all.h"
 
 namespace cc {
 
 namespace {
 
 class RasterOrderComparator {
  public:
   explicit RasterOrderComparator(TreePriority tree_priority)
       : tree_priority_(tree_priority) {}
 
   bool operator()(const TilingSetRasterQueueAll* a_queue,
                   const TilingSetRasterQueueAll* b_queue) const {
     // Note that in this function, we have to return true if and only if
     // a is strictly lower priority than b.
-    const Tile* a_tile = a_queue->Top();
-    const Tile* b_tile = b_queue->Top();
-
-    const TilePriority& a_priority = a_tile->priority();
-    const TilePriority& b_priority = b_tile->priority();
+    const TilePriority& a_priority = a_queue->Top().priority();
+    const TilePriority& b_priority = b_queue->Top().priority();
     bool prioritize_low_res = tree_priority_ == SMOOTHNESS_TAKES_PRIORITY;
 
     // If the bin is the same but the resolution is not, then the order will be
     // determined by whether we prioritize low res or not.
     // TODO(vmpstr): Remove this when TilePriority is no longer a member of Tile
     // class but instead produced by the iterators.
     if (b_priority.priority_bin == a_priority.priority_bin &&
         b_priority.resolution != a_priority.resolution) {
       // Non ideal resolution should be sorted lower than other resolutions.
       if (a_priority.resolution == NON_IDEAL_RESOLUTION)
@@ skipping 47 matching lines @@
   tree_priority_ = tree_priority;
 
   CreateTilingSetRasterQueues(active_layers, tree_priority_, &active_queues_);
   CreateTilingSetRasterQueues(pending_layers, tree_priority_, &pending_queues_);
 }
 
 bool RasterTilePriorityQueueAll::IsEmpty() const {
   return active_queues_.empty() && pending_queues_.empty();
 }
 
-Tile* RasterTilePriorityQueueAll::Top() {
+const PrioritizedTile& RasterTilePriorityQueueAll::Top() const {
   DCHECK(!IsEmpty());
-  ScopedPtrVector<TilingSetRasterQueueAll>& next_queues = GetNextQueues();
+  const ScopedPtrVector<TilingSetRasterQueueAll>& next_queues = GetNextQueues();
   return next_queues.front()->Top();
 }
 
 void RasterTilePriorityQueueAll::Pop() {
   DCHECK(!IsEmpty());
 
   ScopedPtrVector<TilingSetRasterQueueAll>& next_queues = GetNextQueues();
   next_queues.pop_heap(RasterOrderComparator(tree_priority_));
   TilingSetRasterQueueAll* queue = next_queues.back();
   queue->Pop();
 
   // Remove empty queues.
   if (queue->IsEmpty())
     next_queues.pop_back();
   else
     next_queues.push_heap(RasterOrderComparator(tree_priority_));
 }
 
 ScopedPtrVector<TilingSetRasterQueueAll>&
 RasterTilePriorityQueueAll::GetNextQueues() {
+  return const_cast<ScopedPtrVector<TilingSetRasterQueueAll>&>(
+      static_cast<const RasterTilePriorityQueueAll*>(this)->GetNextQueues());
+}
+
+const ScopedPtrVector<TilingSetRasterQueueAll>&
+RasterTilePriorityQueueAll::GetNextQueues() const {
   DCHECK(!IsEmpty());
 
   // If we only have one queue with tiles, return it.
   if (active_queues_.empty())
     return pending_queues_;
   if (pending_queues_.empty())
     return active_queues_;
 
-  const Tile* active_tile = active_queues_.front()->Top();
-  const Tile* pending_tile = pending_queues_.front()->Top();
+  const PrioritizedTile& active_tile = active_queues_.front()->Top();
+  const PrioritizedTile& pending_tile = pending_queues_.front()->Top();
 
-  const TilePriority& active_priority = active_tile->priority();
-  const TilePriority& pending_priority = pending_tile->priority();
+  const TilePriority& active_priority = active_tile.priority();
+  const TilePriority& pending_priority = pending_tile.priority();
 
   switch (tree_priority_) {
     case SMOOTHNESS_TAKES_PRIORITY: {
       // If we're down to eventually bin tiles on the active tree, process the
       // pending tree to allow tiles required for activation to be initialized
       // when memory policy only allows prepaint.
       if (active_priority.priority_bin == TilePriority::EVENTUALLY &&
           pending_priority.priority_bin == TilePriority::NOW) {
         return pending_queues_;
       }
@@ skipping 15 matching lines @@
         return active_queues_;
       return pending_queues_;
     }
     default:
       NOTREACHED();
       return active_queues_;
   }
 }
 
 }  // namespace cc