cc: Remove vectors from tiling eviction tile iterator.

cc/layers/picture_layer_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 59 matching lines @@
     LayerEvictionTileIterator(PictureLayerImpl* layer,
                               TreePriority tree_priority);
     ~LayerEvictionTileIterator();
 
     Tile* operator*();
     const Tile* operator*() const;
     LayerEvictionTileIterator& operator++();
     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_;
   };
 
   static scoped_ptr<PictureLayerImpl> Create(LayerTreeImpl* tree_impl, int id) {
     return make_scoped_ptr(new PictureLayerImpl(tree_impl, id));
   }
   virtual ~PictureLayerImpl();
 
   // LayerImpl overrides.
   virtual const char* LayerTypeAsString() const OVERRIDE;
@@ skipping 118 matching lines @@
   gfx::Rect viewport_rect_for_tile_priority_;
   gfx::Transform screen_space_transform_for_tile_priority_;
 
   friend class PictureLayer;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_LAYER_IMPL_H_