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

cc/resources/tiling_set_raster_queue_all.h

 // 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.
 
 #ifndef CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_
 #define CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_
 
 #include "base/containers/stack_container.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/picture_layer_tiling_set.h"
+#include "cc/resources/prioritized_tile.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 
 namespace cc {
 
 // This queue returns all tiles required to be rasterized from HIGH_RESOLUTION
 // and LOW_RESOLUTION tilings.
 class CC_EXPORT TilingSetRasterQueueAll {
  public:
   TilingSetRasterQueueAll(PictureLayerTilingSet* tiling_set,
                           bool prioritize_low_res);
   ~TilingSetRasterQueueAll();
 
-  Tile* Top();
-  const Tile* Top() const;
+  const PrioritizedTile& Top() const;
   void Pop();
   bool IsEmpty() const;
 
  private:
   // Helper base class for individual region iterators.
   class OnePriorityRectIterator {
    public:
     OnePriorityRectIterator();
     OnePriorityRectIterator(PictureLayerTiling* tiling,
                             TilingData* tiling_data);
 
-    bool done() const { return !tile_; }
-    Tile* operator*() const { return tile_; }
+    bool done() const { return !current_tile_.tile(); }
+    const PrioritizedTile& operator*() const { return current_tile_; }
 
    protected:
     ~OnePriorityRectIterator() = default;
     bool TileNeedsRaster(Tile* tile) const {
       return tile->NeedsRaster() && !tiling_->IsTileOccluded(tile);
     }
 
     template <typename TilingIteratorType>
     void AdvanceToNextTile(TilingIteratorType* iterator);
     template <typename TilingIteratorType>
     bool GetFirstTileAndCheckIfValid(TilingIteratorType* iterator);
 
-    Tile* tile_;
+    PrioritizedTile current_tile_;
     PictureLayerTiling* tiling_;
     TilingData* tiling_data_;
   };
 
   // Iterates over visible rect only, left to right top to bottom order.
   class VisibleTilingIterator : public OnePriorityRectIterator {
    public:
     VisibleTilingIterator() = default;
     VisibleTilingIterator(PictureLayerTiling* tiling, TilingData* tiling_data);
 
@@ skipping 58 matching lines @@
 
   // Iterates over all of the above phases in the following order: visible,
   // skewport, soon border, eventually.
   class TilingIterator {
    public:
     TilingIterator();
     explicit TilingIterator(PictureLayerTiling* tiling,
                             TilingData* tiling_data);
     ~TilingIterator();
 
-    bool done() const { return current_tile_ == nullptr; }
-    const Tile* operator*() const { return current_tile_; }
-    Tile* operator*() { return current_tile_; }
+    bool done() const { return current_tile_.tile() == nullptr; }
+    const PrioritizedTile& operator*() const { return current_tile_; }
     TilePriority::PriorityBin type() const {
       switch (phase_) {
         case VISIBLE_RECT:
           return TilePriority::NOW;
         case PENDING_VISIBLE_RECT:
         case SKEWPORT_RECT:
         case SOON_BORDER_RECT:
           return TilePriority::SOON;
         case EVENTUALLY_RECT:
           return TilePriority::EVENTUALLY;
@@ skipping 18 matching lines @@
       EVENTUALLY_RECT
     };
 
     void AdvancePhase();
 
     PictureLayerTiling* tiling_;
     TilingData* tiling_data_;
 
     Phase phase_;
 
-    Tile* current_tile_;
+    PrioritizedTile current_tile_;
     VisibleTilingIterator visible_iterator_;
     PendingVisibleTilingIterator pending_visible_iterator_;
     SkewportTilingIterator skewport_iterator_;
     SoonBorderTilingIterator soon_border_iterator_;
     EventuallyTilingIterator eventually_iterator_;
   };
 
   enum IteratorType {
     LOW_RES,
     HIGH_RES,
@@ skipping 15 matching lines @@
 
   // The max number of stages is 6: 1 low res, 3 high res, and 2 active non
   // ideal pending high res.
   base::StackVector<IterationStage, 6> stages_;
   TilingIterator iterators_[NUM_ITERATORS];
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILING_SET_RASTER_QUEUE_ALL_H_