cc: Fix layer raster tile iterator not to skip a tile erroneously.

cc/layers/picture_layer_impl.cc

Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index cb8141b66b83d56a7f334ef4cdbaea4717d172f2..c44b688aa971c587917f6a103b141682ff21ec2f 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -1568,7 +1568,7 @@ PictureLayerImpl::LayerRasterTileIterator::LayerRasterTileIterator(
   IteratorType index = stages_[current_stage_].iterator_type;
   TilePriority::PriorityBin tile_type = stages_[current_stage_].tile_type;
   if (!iterators_[index] || iterators_[index].get_type() != tile_type)
-    ++(*this);
+    AdvanceToNextStage();
 }
 
 PictureLayerImpl::LayerRasterTileIterator::~LayerRasterTileIterator() {}
@@ -1584,22 +1584,13 @@ operator++() {
   TilePriority::PriorityBin tile_type = stages_[current_stage_].tile_type;
 
   // First advance the iterator.
-  if (iterators_[index])
-    ++iterators_[index];
-
-  if (iterators_[index] && iterators_[index].get_type() == tile_type)
-    return *this;
+  DCHECK(iterators_[index]);
+  DCHECK(iterators_[index].get_type() == tile_type);
+  ++iterators_[index];
 
-  // Next, advance the stage.
-  ++current_stage_;
-  while (current_stage_ < arraysize(stages_)) {
-    index = stages_[current_stage_].iterator_type;
-    tile_type = stages_[current_stage_].tile_type;
+  if (!iterators_[index] || iterators_[index].get_type() != tile_type)
+    AdvanceToNextStage();
 
-    if (iterators_[index] && iterators_[index].get_type() == tile_type)
-      break;
-    ++current_stage_;
-  }
   return *this;
 }
 
@@ -1623,6 +1614,18 @@ const Tile* PictureLayerImpl::LayerRasterTileIterator::operator*() const {
   return *iterators_[index];
 }
 
+void PictureLayerImpl::LayerRasterTileIterator::AdvanceToNextStage() {
+  ++current_stage_;

[vmpstr, 2014/09/09 17:37:35]

nit: DCHECK_LT(current_stage_, arraysize(stages_));

[USE eero AT chromium.org, 2014/09/10 07:48:19]

Done.

+  while (current_stage_ < arraysize(stages_)) {
+    IteratorType index = stages_[current_stage_].iterator_type;
+    TilePriority::PriorityBin tile_type = stages_[current_stage_].tile_type;
+
+    if (iterators_[index] && iterators_[index].get_type() == tile_type)
+      break;
+    ++current_stage_;
+  }
+}
+
 PictureLayerImpl::LayerEvictionTileIterator::LayerEvictionTileIterator()
     : layer_(NULL),
       tree_priority_(SAME_PRIORITY_FOR_BOTH_TREES),