cc: Use reverse spiral iterator in tiling eviction.

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 daac8387004320ecf006e5d2584b6c1c480c63ff..4e7b4ed6abf0e7207af209f44f0c8ec7e2c2a4bc 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -64,9 +64,7 @@ class CC_EXPORT PictureLayerTiling {
 
   enum EvictionCategory {
     EVENTUALLY,
-    EVENTUALLY_AND_REQUIRED_FOR_ACTIVATION,
     SOON,
-    SOON_AND_REQUIRED_FOR_ACTIVATION,
     NOW,
     NOW_AND_REQUIRED_FOR_ACTIVATION
   };
@@ -122,7 +120,6 @@ class CC_EXPORT PictureLayerTiling {
    public:
     TilingEvictionTileIterator();
     TilingEvictionTileIterator(PictureLayerTiling* tiling,
-                               TreePriority tree_priority,
                                EvictionCategory category);
     ~TilingEvictionTileIterator();
 
@@ -132,8 +129,20 @@ class CC_EXPORT PictureLayerTiling {
     TilingEvictionTileIterator& operator++();
 
    private:
-    const std::vector<Tile*>* eviction_tiles_;
-    size_t current_eviction_tiles_index_;
+    void AdvanceEventually(bool first_run);
+    void AdvanceSoon(bool first_run);
+    void AdvanceNow(bool first_run);
+
+    PictureLayerTiling* tiling_;
+    EvictionCategory eviction_category_;
+
+    bool processing_occluded_now_tiles_;
+    bool processing_soon_border_rect_;
+
+    Tile* current_tile_;
+
+    TilingData::Iterator visible_iterator_;

[reveman, 2014/11/18 20:56:21]

Would it hurt to use a ReverseSpiralDifferenceIterator for visible tiles too?

+    TilingData::ReverseSpiralDifferenceIterator spiral_iterator_;
   };
 
   ~PictureLayerTiling();
@@ -321,10 +330,6 @@ class CC_EXPORT PictureLayerTiling {
                             const gfx::Rect& visible_rect_in_content_space)
       const;
 
-  void UpdateEvictionCacheIfNeeded(TreePriority tree_priority);
-  const std::vector<Tile*>* GetEvictionTiles(TreePriority tree_priority,
-                                             EvictionCategory category);
-
   void Invalidate(const Region& layer_region);
 
   void DoInvalidate(const Region& layer_region,
@@ -365,19 +370,6 @@ class CC_EXPORT PictureLayerTiling {
 
   Occlusion current_occlusion_in_layer_space_;
 
-  // TODO(reveman): Remove this in favour of an array of eviction_tiles_ when we
-  // change all enums to have a consistent way of getting the count/last
-  // element.
-  std::vector<Tile*> eviction_tiles_now_;
-  std::vector<Tile*> eviction_tiles_now_and_required_for_activation_;
-  std::vector<Tile*> eviction_tiles_soon_;
-  std::vector<Tile*> eviction_tiles_soon_and_required_for_activation_;
-  std::vector<Tile*> eviction_tiles_eventually_;
-  std::vector<Tile*> eviction_tiles_eventually_and_required_for_activation_;
-
-  bool eviction_tiles_cache_valid_;
-  TreePriority eviction_cache_tree_priority_;
-
  private:
   DISALLOW_ASSIGN(PictureLayerTiling);