| Index: cc/playback/compositing_display_item.cc
|
| diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
|
| index bee1fb15dcb67ac2f01f7fb5fc8bf8ebd1fba664..cb6117ee4ba963e203d776ebcc972f25f59a56aa 100644
|
| --- a/cc/playback/compositing_display_item.cc
|
| +++ b/cc/playback/compositing_display_item.cc
|
| @@ -38,7 +38,7 @@ void CompositingDisplayItem::SetNew(uint8_t alpha,
|
| }
|
|
|
| void CompositingDisplayItem::Raster(SkCanvas* canvas,
|
| - SkDrawPictureCallback* callback) const {
|
| + SkPicture::AbortCallback* callback) const {
|
| SkPaint paint;
|
| paint.setXfermodeMode(xfermode_);
|
| paint.setAlpha(alpha_);
|
| @@ -65,8 +65,9 @@ EndCompositingDisplayItem::EndCompositingDisplayItem() {
|
| EndCompositingDisplayItem::~EndCompositingDisplayItem() {
|
| }
|
|
|
| -void EndCompositingDisplayItem::Raster(SkCanvas* canvas,
|
| - SkDrawPictureCallback* callback) const {
|
| +void EndCompositingDisplayItem::Raster(
|
| + SkCanvas* canvas,
|
| + SkPicture::AbortCallback* callback) const {
|
| canvas->restore();
|
| }
|
|
|
|
|