| Index: cc/playback/picture_pile_impl.h
|
| diff --git a/cc/playback/picture_pile_impl.h b/cc/playback/picture_pile_impl.h
|
| index 0e1164b2dff8241b8b0d95e89abcdbd4ea953e00..8da3cad1d92d4f97c2318a10717961cf879282f3 100644
|
| --- a/cc/playback/picture_pile_impl.h
|
| +++ b/cc/playback/picture_pile_impl.h
|
| @@ -49,9 +49,10 @@ class CC_EXPORT PicturePileImpl : public RasterSource {
|
| 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;
|
| @@ -78,8 +79,12 @@ class CC_EXPORT PicturePileImpl : public RasterSource {
|
| 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_; }
|
|
|
|
|