cc: Do GatherPixelRefs from skia at record time

cc/resources/picture_pile_impl.cc

 // 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.
 
 #include "base/debug/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/rendering_stats.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/analysis_canvas.h"
@@ skipping 180 matching lines @@
 #endif  // NDEBUG
 
   // We should always paint some part of |content_rect|.
   DCHECK(!unclipped.Contains(content_rect));
 
   canvas->restore();
 
   return total_pixels_rasterized;
 }
 
-void PicturePileImpl::GatherPixelRefs(
-    gfx::Rect content_rect,
-    float contents_scale,
-    std::list<skia::LazyPixelRef*>& pixel_refs) {
-  std::list<skia::LazyPixelRef*> result;
-
-  gfx::Rect layer_rect = gfx::ToEnclosingRect(
-      gfx::ScaleRect(content_rect, 1.f / contents_scale));
-
-  for (TilingData::Iterator tile_iter(&tiling_, layer_rect);
-       tile_iter; ++tile_iter) {
-    PictureListMap::iterator map_iter =
-        picture_list_map_.find(tile_iter.index());
-    if (map_iter == picture_list_map_.end())
-      continue;
-
-    PictureList& pic_list = map_iter->second;
-    for (PictureList::const_iterator i = pic_list.begin();
-         i != pic_list.end(); ++i) {
-      (*i)->GatherPixelRefs(layer_rect, result);
-      pixel_refs.splice(pixel_refs.end(), result);
-    }
-  }
-}
-
 skia::RefPtr<SkPicture> PicturePileImpl::GetFlattenedPicture() {
   TRACE_EVENT0("cc", "PicturePileImpl::GetFlattenedPicture");
 
   gfx::Rect layer_rect(tiling_.total_size());
   skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture);
   if (layer_rect.IsEmpty())
     return picture;
 
   SkCanvas* canvas = picture->beginRecording(
       layer_rect.width(),
@@ skipping 34 matching lines @@
 PicturePileImpl::Analysis::Analysis()
   : is_solid_color(false),
     is_transparent(false),
     has_text(false),
     is_cheap_to_raster(false) {
 }
 
 PicturePileImpl::Analysis::~Analysis() {
 }
 
+PicturePileImpl::LazyPixelRefIterator::LazyPixelRefIterator(
+    gfx::Rect content_rect,
+    float contents_scale,
+    const PicturePileImpl* picture_pile)
+    : picture_pile_(picture_pile),
+      layer_rect_(gfx::ToEnclosingRect(
+          gfx::ScaleRect(content_rect, 1.f / contents_scale))),
+      tile_iterator_(&picture_pile_->tiling_, layer_rect_),
+      current_pixel_ref_(NULL) {
+  ++(*this);
+}
+
+PicturePileImpl::LazyPixelRefIterator::~LazyPixelRefIterator() {
+}
+
+PicturePileImpl::LazyPixelRefIterator&
+    PicturePileImpl::LazyPixelRefIterator::operator++() {
+  while (true) {
+    // If there are still pixel refs on the current picture,
+    // advance the picture refs iterator.
+    if (picture_refs_iterator_) {
+      current_pixel_ref_ = *picture_refs_iterator_;
+      ++picture_refs_iterator_;
+      break;
+    }
+
+    // If there are pictures left in the current tile's list, process them.
+    if (!picture_list_.empty()) {
+      scoped_refptr<Picture> picture = picture_list_.front();
+      picture_list_.pop_front();
+      picture_refs_iterator_ = Picture::LazyPixelRefIterator(
+          layer_rect_,
+          picture.get());
+      continue;
+    }
+
+    // If we're out of tiles, we're done.
+    if (!tile_iterator_) {
+      current_pixel_ref_ = NULL;
+      break;
+    }
+
+    // Grab a new picture list from the current tile,
+    // and advance the tile iterator.
+    PictureListMap::const_iterator map_iterator =
+        picture_pile_->picture_list_map_.find(tile_iterator_.index());
+    ++tile_iterator_;
+    if (map_iterator == picture_pile_->picture_list_map_.end())
+      continue;
+
+    picture_list_ = map_iterator->second;

[reveman, 2013/04/22 19:56:06]

Lets try to avoid copying a list here as well.

[vmpstr, 2013/04/22 22:38:16]

Done.

+  }
+  return *this;
+}
+
 }  // namespace cc