cc: Remove vectors from tiling eviction tile iterator.

cc/layers/picture_layer_impl.h

Index: cc/layers/picture_layer_impl.h
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index fcf92fe5ff9fca6f5309da73de5ab38ff93018f3..76a0d5b9639890413e526d1a3b3d61f3c60b0574 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -77,15 +77,33 @@ class CC_EXPORT PictureLayerImpl
     operator bool() const;
 
    private:
+    enum IterationStage {
+      EVENTUALLY,
+      EVENTUALLY_AND_REQUIRED_FOR_ACTIVATION,
+      SOON,
+      SOON_AND_REQUIRED_FOR_ACTIVATION,
+      NOW,
+      NOW_AND_REQUIRED_FOR_ACTIVATION
+    };
+
+    TilePriority::PriorityBin PriorityBinFromIterationStage(
+        IterationStage stage);
+    bool RequiredForActivationFromIterationStage(IterationStage stage);
+
+    PictureLayerTilingSet::TilingRange CurrentRange();
+    int CurrentTilingIndex();
+
     void AdvanceToNextIterator();
-    bool IsCorrectType(
-        PictureLayerTiling::TilingEvictionTileIterator* it) const;
+    bool AdvanceTiling();
+    bool AdvanceRange();
+    bool AdvanceStage();

[reveman, 2014/08/01 17:54:47]

Please get these function names and variables names below to line up so it's
easy to see what is used for what. ie. AdvanceToNextTiling would use the
"current_tiling_" state and AdvanceToNextTilingRangeType would use
current_tiling_range_type_ state..

[vmpstr, 2014/08/01 19:39:50]

Done.

 
-    std::vector<PictureLayerTiling::TilingEvictionTileIterator> iterators_;
-    size_t iterator_index_;
-    TilePriority::PriorityBin iteration_stage_;
-    bool required_for_activation_;
+    PictureLayerTiling::TilingEvictionTileIterator iterator_;
+    int current_range_offset_;

[reveman, 2014/08/01 17:54:47]

size_t instead of int?

[vmpstr, 2014/08/01 19:39:50]

Done.

+    PictureLayerTilingSet::TilingRangeType current_tiling_range_type_;
+    IterationStage current_stage_;

[reveman, 2014/08/01 17:54:47]

maybe current_iteration_stage_ instead to be perfectly consistent.

[vmpstr, 2014/08/01 19:39:50]

Done.

 
+    TreePriority tree_priority_;
     PictureLayerImpl* layer_;
   };