cc: Implement geometry-based tile 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 e1ccde4ded5978d49ce9e473a62e3cdb26ebe739..e844017bcbf11dd5ac24720c22c9025716d07364 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -123,7 +123,8 @@ class CC_EXPORT PictureLayerTiling {
     TilingEvictionTileIterator();
     TilingEvictionTileIterator(PictureLayerTiling* tiling,
                                TreePriority tree_priority,
-                               EvictionCategory category);
+                               EvictionCategory category,
+                               bool skip_shared_out_of_order_tiles);
     ~TilingEvictionTileIterator();
 
     operator bool() const;
@@ -132,8 +133,24 @@ class CC_EXPORT PictureLayerTiling {
     TilingEvictionTileIterator& operator++();
 
    private:
-    const std::vector<Tile*>* eviction_tiles_;
-    size_t current_eviction_tiles_index_;
+    void AdvanceEventually();
+    void AdvanceSoon();
+    void AdvanceNow();
+    bool PreparseTileUnlessReturningShouldBeDoneByTwin(Tile* tile) const;
+
+    PictureLayerTiling* tiling_;
+    TreePriority tree_priority_;
+    EvictionCategory eviction_category_;
+
+    bool processing_soon_border_rect_;
+    bool skip_shared_out_of_order_tiles_;
+    std::vector<Tile*> unoccluded_now_tiles_;
+    size_t unoccluded_now_tiles_index_;
+
+    Tile* current_tile_;
+
+    TilingData::Iterator visible_iterator_;
+    TilingData::ReverseSpiralDifferenceIterator spiral_iterator_;
   };
 
   ~PictureLayerTiling();
@@ -321,10 +338,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 +378,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);