cc: Plumb more details about pixel refs to tile manager.

cc/playback/picture_pile_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_PLAYBACK_PICTURE_PILE_IMPL_H_
 #define CC_PLAYBACK_PICTURE_PILE_IMPL_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 31 matching lines @@
                         const gfx::Rect& canvas_bitmap_rect,
                         const gfx::Rect& canvas_playback_rect,
                         float contents_scale) const override;
   void PlaybackToSharedCanvas(SkCanvas* canvas,
                               const gfx::Rect& canvas_rect,
                               float contents_scale) const override;
   void PerformSolidColorAnalysis(
       const gfx::Rect& content_rect,
       float contents_scale,
       RasterSource::SolidColorAnalysis* analysis) const override;
-  void GatherPixelRefs(const gfx::Rect& content_rect,
-                       float contents_scale,
-                       std::vector<SkPixelRef*>* pixel_refs) const override;
+  void GatherPixelRefs(
+      const gfx::Rect& content_rect,
+      float contents_scale,
+      std::vector<skia::PositionPixelRef>* pixel_refs) const override;
   bool CoversRect(const gfx::Rect& content_rect,
                   float contents_scale) const override;
   void SetShouldAttemptToUseDistanceFieldText() override;
   bool ShouldAttemptToUseDistanceFieldText() const override;
   gfx::Size GetSize() const override;
   bool IsSolidColor() const override;
   SkColor GetSolidColor() const override;
   bool HasRecordings() const override;
   bool CanUseLCDText() const override;
   scoped_refptr<RasterSource> CreateCloneWithoutLCDText() const override;
 
   // Tracing functionality.
   void DidBeginTracing() override;
   void AsValueInto(base::trace_event::TracedValue* array) const override;
   skia::RefPtr<SkPicture> GetFlattenedPicture() override;
   size_t GetPictureMemoryUsage() const override;
 
   // Iterator used to return SkPixelRefs from this picture pile.
   // Public for testing.
   class CC_EXPORT PixelRefIterator {
    public:
     PixelRefIterator(const gfx::Rect& content_rect,
                      float contents_scale,
                      const PicturePileImpl* picture_pile);
     ~PixelRefIterator();
 
-    SkPixelRef* operator->() const { return *pixel_ref_iterator_; }
-    SkPixelRef* operator*() const { return *pixel_ref_iterator_; }
+    const skia::PositionPixelRef* operator->() const {
+      return &(*pixel_ref_iterator_);
+    }
+    const skia::PositionPixelRef& operator*() const {
+      return *pixel_ref_iterator_;
+    }
     PixelRefIterator& operator++();
     operator bool() const { return pixel_ref_iterator_; }
 
    private:
     void AdvanceToTilePictureWithPixelRefs();
 
     const PicturePileImpl* picture_pile_;
     gfx::Rect layer_rect_;
     TilingData::Iterator tile_iterator_;
     PixelRefMap::Iterator pixel_ref_iterator_;
@@ skipping 58 matching lines @@
   bool CanRasterSlowTileCheck(const gfx::Rect& layer_rect) const;
 
   gfx::Rect PaddedRect(const PictureMapKey& key) const;
 
   DISALLOW_COPY_AND_ASSIGN(PicturePileImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_PICTURE_PILE_IMPL_H_