cc: Do GatherPixelRefs from skia at record time

cc/resources/picture_pile_impl.h

Index: cc/resources/picture_pile_impl.h
diff --git a/cc/resources/picture_pile_impl.h b/cc/resources/picture_pile_impl.h
index 352772d83cae7cd5afbcc045fcaaa1f8beb5da42..8da09c4960b5ac1842eba71d39e618e8ae8b3915 100644
--- a/cc/resources/picture_pile_impl.h
+++ b/cc/resources/picture_pile_impl.h
@@ -37,11 +37,6 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
       gfx::Rect canvas_rect,
       float contents_scale);
 
-  void GatherPixelRefs(
-      gfx::Rect content_rect,
-      float contents_scale,
-      std::list<skia::LazyPixelRef*>& pixel_refs);
-
   skia::RefPtr<SkPicture> GetFlattenedPicture();
 
   struct CC_EXPORT Analysis {
@@ -61,8 +56,31 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
                      float contents_scale,
                      Analysis* analysis);
 
+  class CC_EXPORT PixelRefIterator {
+   public:
+    PixelRefIterator(gfx::Rect content_rect,
+                     float contents_scale,
+                     const PicturePileImpl* picture_pile);
+    ~PixelRefIterator();
+
+    skia::LazyPixelRef* operator->() const { return current_pixel_ref_; }
+    skia::LazyPixelRef* operator*() const { return current_pixel_ref_; }
+    PixelRefIterator& operator++();
+    operator bool() const { return current_pixel_ref_; }
+
+   private:
+    const PicturePileImpl* picture_pile_;
+    gfx::Rect layer_rect_;
+    TilingData::Iterator tile_iterator_;
+    Picture::PixelRefIterator picture_refs_iterator_;

[reveman, 2013/04/24 14:10:52]

picture_refs_iterator_ is a confusing name. should this be
picture_pixel_ref_iterator_ or just pixel_ref_iterator?

[vmpstr, 2013/04/24 21:11:10]

Done.

+    const PictureList* picture_list_;
+    PictureList::const_iterator picture_list_iterator_;
+    skia::LazyPixelRef* current_pixel_ref_;
+  };
+
  protected:
   friend class PicturePile;
+  friend class PixelRefIterator;
 
   explicit PicturePileImpl(bool enable_lcd_text);
   PicturePileImpl(const PicturePileBase* other, bool enable_lcd_text);