| Index: cc/playback/filter_display_item.cc
|
| diff --git a/cc/playback/filter_display_item.cc b/cc/playback/filter_display_item.cc
|
| index 212d6e43570795910409185a73aed2b2c688e4ad..2f82abed842f6c16b7efe9e760e68a90eaa1da9a 100644
|
| --- a/cc/playback/filter_display_item.cc
|
| +++ b/cc/playback/filter_display_item.cc
|
| @@ -11,6 +11,8 @@
|
| #include "cc/output/render_surface_filters.h"
|
| #include "cc/proto/display_item.pb.h"
|
| #include "cc/proto/gfx_conversions.h"
|
| +#include "skia/ext/cdl_canvas.h"
|
| +#include "skia/ext/cdl_paint.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkImageFilter.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| @@ -56,7 +58,7 @@ void FilterDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
|
| // TODO(dtrainor): Support serializing FilterOperations (crbug.com/541321).
|
| }
|
|
|
| -void FilterDisplayItem::Raster(SkCanvas* canvas,
|
| +void FilterDisplayItem::Raster(CdlCanvas* canvas,
|
| SkPicture::AbortCallback* callback) const {
|
| canvas->save();
|
| canvas->translate(origin_.x(), origin_.y());
|
| @@ -66,7 +68,7 @@ void FilterDisplayItem::Raster(SkCanvas* canvas,
|
| SkRect boundaries = RectFToSkRect(bounds_);
|
| boundaries.offset(-origin_.x(), -origin_.y());
|
|
|
| - SkPaint paint;
|
| + CdlPaint paint;
|
| paint.setBlendMode(SkBlendMode::kSrcOver);
|
| paint.setImageFilter(std::move(image_filter));
|
| canvas->saveLayer(&boundaries, &paint);
|
| @@ -100,7 +102,7 @@ void EndFilterDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
|
| proto->set_type(proto::DisplayItem::Type_EndFilter);
|
| }
|
|
|
| -void EndFilterDisplayItem::Raster(SkCanvas* canvas,
|
| +void EndFilterDisplayItem::Raster(CdlCanvas* canvas,
|
| SkPicture::AbortCallback* callback) const {
|
| canvas->restore();
|
| canvas->restore();
|
|
|