cc: Move tiling raster tile iterator to be a tiling set queue class.

cc/resources/picture_layer_tiling.h

Index: cc/resources/picture_layer_tiling.h
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index a5a4efa33dc2768c19c5975167d7a4f458de8177..f09971202cdbf447b5e289e5f00e085e939dcf0e 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -58,53 +58,6 @@ class CC_EXPORT PictureLayerTiling {
  public:
   static const int kBorderTexels = 1;
 
-  class CC_EXPORT TilingRasterTileIterator {
-   public:
-    TilingRasterTileIterator();
-    explicit TilingRasterTileIterator(PictureLayerTiling* tiling);
-    ~TilingRasterTileIterator();
-
-    operator bool() const { return !!current_tile_; }
-    const Tile* operator*() const { return current_tile_; }
-    Tile* operator*() { return current_tile_; }
-    TilePriority::PriorityBin get_type() const {
-      switch (phase_) {
-        case VISIBLE_RECT:
-          return TilePriority::NOW;
-        case SKEWPORT_RECT:
-        case SOON_BORDER_RECT:
-          return TilePriority::SOON;
-        case EVENTUALLY_RECT:
-          return TilePriority::EVENTUALLY;
-      }
-      NOTREACHED();
-      return TilePriority::EVENTUALLY;
-    }
-
-    TilingRasterTileIterator& operator++();
-
-   private:
-    enum Phase {
-      VISIBLE_RECT,
-      SKEWPORT_RECT,
-      SOON_BORDER_RECT,
-      EVENTUALLY_RECT
-    };
-
-    void AdvancePhase();
-    bool TileNeedsRaster(Tile* tile) const {
-      return tile->NeedsRaster() && !tiling_->IsTileOccluded(tile);
-    }
-
-    PictureLayerTiling* tiling_;
-
-    Phase phase_;
-
-    Tile* current_tile_;
-    TilingData::Iterator visible_iterator_;
-    TilingData::SpiralDifferenceIterator spiral_iterator_;
-  };
-
   ~PictureLayerTiling();
 
   // Create a tiling with no tiles. CreateTile() must be called to add some.
@@ -155,7 +108,7 @@ class CC_EXPORT PictureLayerTiling {
 
   void UpdateAllTilePrioritiesForTesting() {
     for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
-      UpdateTileAndTwinPriority(it->second.get());
+      UpdateTilePriority(it->second.get());
   }
 
   std::vector<scoped_refptr<Tile>> AllRefTilesForTesting() const {
@@ -182,6 +135,27 @@ class CC_EXPORT PictureLayerTiling {
   bool IsTileRequiredForActivationIfVisible(const Tile* tile) const;
   bool IsTileRequiredForDrawIfVisible(const Tile* tile) const;
 
+  void UpdateTilePriority(Tile* tile) const;
+  bool has_visible_rect_tiles() const { return has_visible_rect_tiles_; }
+  bool has_skewport_rect_tiles() const { return has_skewport_rect_tiles_; }
+  bool has_soon_border_rect_tiles() const {
+    return has_soon_border_rect_tiles_;
+  }
+  bool has_eventually_rect_tiles() const { return has_eventually_rect_tiles_; }
+
+  const gfx::Rect& current_visible_rect() const {
+    return current_visible_rect_;
+  }
+  const gfx::Rect& current_skewport_rect() const {
+    return current_skewport_rect_;
+  }
+  const gfx::Rect& current_soon_border_rect() const {
+    return current_soon_border_rect_;
+  }
+  const gfx::Rect& current_eventually_rect() const {
+    return current_eventually_rect_;
+  }
+
   // Iterate over all tiles to fill content_rect.  Even if tiles are invalid
   // (i.e. no valid resource) this tiling should still iterate over them.
   // The union of all geometry_rect calls for each element iterated over should
@@ -259,7 +233,7 @@ class CC_EXPORT PictureLayerTiling {
 
  protected:
   friend class CoverageIterator;
-  friend class TilingRasterTileIterator;
+  friend class TilingSetRasterQueue;
   friend class TilingSetEvictionQueue;
 
   typedef std::pair<int, int> TileMapKey;
@@ -296,8 +270,7 @@ class CC_EXPORT PictureLayerTiling {
                                const gfx::Rect& eventually_rect,
                                const Occlusion& occlusion_in_layer_space);
 
-  void UpdateTileAndTwinPriority(Tile* tile) const;
-  void UpdateTilePriority(Tile* tile) const;
+  void UpdateTilePriorityForTree(Tile* tile, WhichTree tree) const;
   bool NeedsUpdateForFrameAtTimeAndViewport(
       double frame_time_in_seconds,
       const gfx::Rect& viewport_in_layer_space) {