cc: Rework tiling set eviction iterator.

cc/resources/tiling_set_eviction_queue.h

Index: cc/resources/tiling_set_eviction_queue.h
diff --git a/cc/resources/tiling_set_eviction_queue.h b/cc/resources/tiling_set_eviction_queue.h
index b7027c4b5888914e3796d58fcb972a94ab5852b1..56ee43a1f0b03d77ddc8cc027472522ba3adc37a 100644
--- a/cc/resources/tiling_set_eviction_queue.h
+++ b/cc/resources/tiling_set_eviction_queue.h
@@ -13,65 +13,47 @@
 namespace cc {
 
 // This eviction queue returned tiles from all tilings in a tiling set in
-// the following order:
-// 1) Eventually rect tiles (EVENTUALLY tiles).
-//    1) Eventually rect tiles not required for activation from each tiling in
-//       the tiling set, in turn, in the following order:
-//       1) the first higher than high res tiling, the second one and so on
-//       2) the first lower than low res tiling, the second one and so on
-//       3) the first between high and low res tiling, the second one and so on
-//       4) low res tiling
-//       5) high res tiling
-//    2) Eventually rect tiles required for activation from the tiling with
-//       required for activation tiles. In the case of a pending tree tiling
-//       set that is the high res tiling. In the case of an active tree tiling
-//       set that is a tiling whose twin tiling is a pending tree high res
-//       tiling.
-// 2) Soon border rect and skewport rect tiles (whose priority bin is SOON
-//    unless the max tile priority bin is lowered by PictureLayerTilingClient).
-//    1) Soon border rect and skewport rect tiles not required for activation
-//       from each tiling in the tiling set.
-//        * Tilings are iterated in the same order as in the case of eventually
-//          rect tiles not required for activation.
-//        * For each tiling, first soon border rect tiles and then skewport
-//          rect tiles are returned.
-//    2) Soon border rect and skewport rect tiles required for activation from
-//       the tiling with required for activation tiles.
-//        * First soon border rect tiles and then skewport rect tiles are
-//          returned.
-// 3) Visible rect tiles (whose priority bin is NOW unless the max tile
-//    priority bin is lowered by PictureLayerTilingClient).
-//    1) Visible rect tiles not required for activation from each tiling in
-//       the tiling set.
-//        * Tilings are iterated in the same order as in the case of eventually
-//          rect tiles not required for activation.
-//        * For each tiling, first occluded tiles and then unoccluded tiles
-//          are returned.
-//    2) Visible rect tiles required for activation from the tiling with
-//       required for activation tiles.
-//        * First occluded tiles and then unoccluded tiles are returned.
-//    If the max tile priority bin is lowered by PictureLayerTilingClient,
-//    occlusion is not taken into account as occlusion is meaningful only for
-//    NOW tiles.
+// the order in which the tiles should be evicted. It can be thought of as the
+// following:
+//  for all phases:
+//    for all ordered tilings:
+//      yield the next tile for the given phase from the given tiling
 //
-// Within each tiling and tile priority rect, tiles are returned in reverse
-// spiral order i.e. in (mostly) decreasing distance-to-visible order.
+// Phases are the following (in order in which they are processed):
+// EVENTUALLY_RECT - Tiles in the eventually region of the tiling.
+// SOON_BORDER_RECT - Tiles in the prepainting skirt of the tiling.
+// SKEWPORT_RECT - Tiles in the skewport of the tiling.
+// VISIBLE_RECT_OCCLUDED - Occluded, not required for activation, visible tiles.
+// VISIBLE_RECT_UNOCCLUDED - Unoccluded, not required for activation, visible
+//     tiles.
+// VISIBLE_RECT_REQUIRED_FOR_ACTIVATION_OCCLUDED - Occluded, but required for
+//     activation, visible tiles. This can happen when an active tree tile is
+//     occluded, but is not occluded on the pending tree (and is required for
+//     activation).
+// VISIBLE_RECT_REQUIRED_FOR_ACTIVATION_UNOCCLUDED - Unoccluded, required for
+//     activation, tiles.
 //
-// If the skip_shared_out_of_order_tiles value passed to the constructor is
-// true (like it should be when there is a twin layer with a twin tiling set),
-// eviction queue does not return shared which are out of order because their
-// priority for tree priority is lowered or raised by a twin layer.
-//  * If tree_priority is SAME_PRIORITY_FOR_BOTH_TREES, this happens for
-//    a tile specific lower priority tree eviction queue (because priority for
-//    tree priority is a merged priority).
-//  * If tree priority is NEW_CONTENT_TAKES_PRIORITY, this happens for
-//    an active tree eviction queue (because priority for tree priority is
-//    the pending priority).
-//  * If tree_priority is SMOOTHNESS_TAKES_PRIORITY, this happens for a pending
-//    tree eviction queue (because priority for tree priority is the active
-//    priority).
-// Those skipped shared out of order tiles are when returned only by the twin
-// eviction queue.
+// The tilings are ordered as follows. Suppose we have tilings with the scales
+// below:
+// 2.0   1.5   1.0(HR)   0.8   0.5   0.25(LR)   0.2   0.1
+// With HR referring to high res tiling and LR referring to low res tiling,
+// then tilings are processed in this order:
+// 2.0   1.5   0.1   0.2   0.5   0.8   0.25(LR)   1.0(HR).
+//
+// To put it differently:
+//  1. Process higher than high res tilings.

[enne (OOO), 2015/03/27 19:12:11]

I feel like this needs wording like "down to" or "up to" to indicate the order
that you process higher than high res tilings, e.g. "Process the highest scale
tiling down to, but not including, high res."

[vmpstr, 2015/03/27 20:19:27]

Done.

+//  2. Process lower than low res tilings.
+//  3. Process tilings between high and low res.
+//  4. Process the low res tiling.
+//  5. Process the high res tiling.
+//
+// Additional notes:
+// Since eventually the tiles are considered to have the priority which is the
+// higher of the two trees, we might visit a tile that should actually be
+// returned by its twin. In those situations, the tiles are not returned. That
+// is, since the twin has higher priority, it should return it when it gets to
+// it. This ensures that we don't block raster because we've returned a tile
+// with low priority on one tree, but high combined priority.
 class CC_EXPORT TilingSetEvictionQueue {
  public:
   TilingSetEvictionQueue(PictureLayerTilingSet* tiling_set,
@@ -85,34 +67,128 @@ class CC_EXPORT TilingSetEvictionQueue {
   bool IsEmpty() const;
 
  private:
-  bool AdvanceToNextEvictionTile();
-  bool AdvanceToNextPriorityBin();
-  bool AdvanceToNextTilingRangeType();
-  bool AdvanceToNextValidTiling();
+  enum Phase {
+    EVENTUALLY_RECT,
+    SOON_BORDER_RECT,
+    SKEWPORT_RECT,
+    VISIBLE_RECT_OCCLUDED,
+    VISIBLE_RECT_UNOCCLUDED,
+    VISIBLE_RECT_REQUIRED_FOR_ACTIVATION_OCCLUDED,
+    VISIBLE_RECT_REQUIRED_FOR_ACTIVATION_UNOCCLUDED
+  };
+
+  void GenerateTilingOrder(PictureLayerTilingSet* tiling_set);
+
+  // Helper base class for individual region iterators.
+  class OnePriorityRectIterator {

[enne (OOO), 2015/03/27 19:12:11]

What does "one priority" mean?

[vmpstr, 2015/03/27 20:19:27]

Well, it's just one priority rect as in eventually or soon border or skewport or
visible

I just want to extract some of the common functionality of those into one class.
This is the name we have in the equivalent raster iterators, but I'm open to
suggestions for a name that better captures the intent.

[enne (OOO), 2015/03/27 21:48:05]

I guess it's the "OnePriority" part that confuses me.

What about just like RectIterator? Or even EvictionRectIterator?

[vmpstr, 2015/03/27 22:46:55]

Done.

+   public:
+    OnePriorityRectIterator();
+    OnePriorityRectIterator(std::vector<PictureLayerTiling*>* tilings,
+                            WhichTree tree,
+                            TreePriority tree_priority,
+                            bool skip_shared_out_of_order_tiles,
+                            bool skip_all_shared_tiles);
+
+    bool done() const { return !tile_; }
+    Tile* operator*() const { return tile_; }
+
+   protected:
+    ~OnePriorityRectIterator() = default;
+
+    template <typename TilingIteratorType>
+    bool AdvanceToNextTile(TilingIteratorType* iterator);
+    template <typename TilingIteratorType>
+    bool GetFirstTileAndCheckIfValid(TilingIteratorType* iterator);
+
+    Tile* tile_;
+    std::vector<PictureLayerTiling*>* tilings_;
+    WhichTree tree_;
+    TreePriority tree_priority_;
+    bool skip_shared_out_of_order_tiles_;
+    bool skip_all_shared_tiles_;
+    size_t tiling_index_;
+  };
+
+  class VisibleTilingIterator : public OnePriorityRectIterator {
+   public:
+    VisibleTilingIterator() = default;
+    VisibleTilingIterator(std::vector<PictureLayerTiling*>* tilings,
+                          WhichTree tree,
+                          TreePriority tree_priority,
+                          bool skip_shared_out_of_order_tiles,
+                          bool skip_all_shared_tiles,
+                          bool return_occluded_tiles,
+                          bool return_required_for_activation_tiles);
+
+    VisibleTilingIterator& operator++();
+
+   private:
+    bool TileMatchesRequiredFlags(const Tile* tile) const;
 
-  PictureLayerTilingSet::TilingRange CurrentTilingRange() const;
-  size_t CurrentTilingIndex() const;
-  bool IsSharedOutOfOrderTile(const Tile* tile) const;
-  size_t TilingIndexWithRequiredForActivationTiles() const;
+    TilingData::Iterator iterator_;
+    bool return_occluded_tiles_;
+    bool return_required_for_activation_tiles_;
+  };
+
+  class SkewportTilingIterator : public OnePriorityRectIterator {
+   public:
+    SkewportTilingIterator() = default;
+    SkewportTilingIterator(std::vector<PictureLayerTiling*>* tilings,
+                           WhichTree tree,
+                           TreePriority tree_priority,
+                           bool skip_shared_out_of_order_tiles,
+                           bool skip_all_shared_tiles);
+
+    SkewportTilingIterator& operator++();
+
+   private:
+    TilingData::ReverseSpiralDifferenceIterator iterator_;
+  };
+
+  class SoonBorderTilingIterator : public OnePriorityRectIterator {
+   public:
+    SoonBorderTilingIterator() = default;
+    SoonBorderTilingIterator(std::vector<PictureLayerTiling*>* tilings,
+                             WhichTree tree,
+                             TreePriority tree_priority,
+                             bool skip_shared_out_of_order_tiles,
+                             bool skip_all_shared_tiles);
+
+    SoonBorderTilingIterator& operator++();
+
+   private:
+    TilingData::ReverseSpiralDifferenceIterator iterator_;
+  };
+
+  class EventuallyTilingIterator : public OnePriorityRectIterator {
+   public:
+    EventuallyTilingIterator() = default;
+    EventuallyTilingIterator(std::vector<PictureLayerTiling*>* tilings,
+                             WhichTree tree,
+                             TreePriority tree_priority,
+                             bool skip_shared_out_of_order_tiles,
+                             bool skip_all_shared_tiles);
+
+    EventuallyTilingIterator& operator++();
+
+   private:
+    TilingData::ReverseSpiralDifferenceIterator iterator_;
+  };
+
+  void AdvancePhase();
 
-  PictureLayerTilingSet* tiling_set_;
   WhichTree tree_;
   TreePriority tree_priority_;
   bool skip_all_shared_tiles_;
   bool skip_shared_out_of_order_tiles_;
-  bool processing_soon_border_rect_;
-  bool processing_tiling_with_required_for_activation_tiles_;
-  size_t tiling_index_with_required_for_activation_tiles_;
-
-  TilePriority::PriorityBin current_priority_bin_;
-  PictureLayerTiling* current_tiling_;
-  size_t current_tiling_index_;
-  PictureLayerTilingSet::TilingRangeType current_tiling_range_type_;
-  Tile* current_eviction_tile_;
-
-  TilingData::ReverseSpiralDifferenceIterator spiral_iterator_;
-  TilingData::Iterator visible_iterator_;
-  std::vector<Tile*> unoccluded_now_tiles_;
+  Phase phase_;
+  Tile* current_tile_;
+  std::vector<PictureLayerTiling*> tilings_;
+
+  EventuallyTilingIterator eventually_iterator_;
+  SoonBorderTilingIterator soon_iterator_;
+  SkewportTilingIterator skewport_iterator_;
+  VisibleTilingIterator visible_iterator_;
 };
 
 }  // namespace cc