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 RangeType {
+      HIGHER_THAN_HIGH_RES,
+      LOWER_THAN_LOW_RES,
+      BETWEEN_HIGH_AND_LOW_RES,
+      LOW_RES,
+      HIGH_RES,
+      NUM_RANGE_TYPES
+    };
+    struct TilingIterationRange {
+      int start_index;
+      int one_past_end_index;
+    };
+
+    void ConstructRanges();
+    bool CurrentTilingIndexInRange();
     void AdvanceToNextIterator();
-    bool IsCorrectType(
-        PictureLayerTiling::TilingEvictionTileIterator* it) const;
+    bool AdvanceTiling();
+    bool AdvanceRange();
+    bool AdvanceStage();
 
-    std::vector<PictureLayerTiling::TilingEvictionTileIterator> iterators_;
-    size_t iterator_index_;
+    PictureLayerTiling::TilingEvictionTileIterator iterator_;
+    int tiling_index_;

[reveman, 2014/07/29 21:41:33]

nit: current_tiling_

btw, might be cleaner to maintain this as an offset in the tiling range rather
than offset from first tiling in the tiling set

[vmpstr, 2014/07/30 00:18:52]

I changed it to current_tiling_index_. I would prefer to keep the word "index"
in there, so it's clear that this is not an actual tiling object/pointer.

[reveman, 2014/07/30 16:06:48]

Acknowledged.

     TilePriority::PriorityBin iteration_stage_;

[reveman, 2014/07/29 21:41:33]

Maybe add something like this to make it clear that required_for_activation is
part of the stage.

struct IterationStage {
  bool required_for_activation;
  TilePriority::PriorityBin tile_type;
};

IterationStage current_stage_;

[vmpstr, 2014/07/30 00:18:52]

Done.

+    TilingIterationRange ranges_[NUM_RANGE_TYPES];
+    int range_index_;

[reveman, 2014/07/29 21:41:33]

nit: current_range_

and "TilingSet::TilingRangeType current_range_" when rebased on my patch.

[vmpstr, 2014/07/30 00:18:52]

Likewise I changed it to current_range_type_

[reveman, 2014/07/30 16:06:48]

Acknowledged.

     bool required_for_activation_;
+    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.
@@ skipping 119 matching lines @@
   gfx::Size viewport_size_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_