| Index: cc/playback/compositing_display_item.cc
|
| diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
|
| index 2d8197d030fdc273b2e9529a4a3d1903984ea8dc..a72aa603f8dc38999ffdf22c9bd7f263357546c7 100644
|
| --- a/cc/playback/compositing_display_item.cc
|
| +++ b/cc/playback/compositing_display_item.cc
|
| @@ -12,6 +12,7 @@
|
| #include "cc/proto/display_item.pb.h"
|
| #include "cc/proto/gfx_conversions.h"
|
| #include "cc/proto/skia_conversions.h"
|
| +#include "skia/ext/cdl_paint.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkData.h"
|
| #include "third_party/skia/include/core/SkFlattenable.h"
|
| @@ -95,10 +96,9 @@ void CompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
|
| details->set_lcd_text_requires_opaque_layer(lcd_text_requires_opaque_layer_);
|
| }
|
|
|
| -void CompositingDisplayItem::Raster(
|
| - SkCanvas* canvas,
|
| - SkPicture::AbortCallback* callback) const {
|
| - SkPaint paint;
|
| +void CompositingDisplayItem::Raster(CdlCanvas* canvas,
|
| + SkPicture::AbortCallback* callback) const {
|
| + CdlPaint paint;
|
| paint.setBlendMode(xfermode_);
|
| paint.setAlpha(alpha_);
|
| paint.setColorFilter(color_filter_);
|
| @@ -144,7 +144,7 @@ void EndCompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
|
| }
|
|
|
| void EndCompositingDisplayItem::Raster(
|
| - SkCanvas* canvas,
|
| + CdlCanvas* canvas,
|
| SkPicture::AbortCallback* callback) const {
|
| canvas->restore();
|
| }
|
|
|