| Index: cc/playback/compositing_display_item.cc
|
| diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
|
| index 125526a10abf483183395fd4992981ab71cc4e3d..e3d3c9bcbfb52df91143d68cc85c4f7efd256443 100644
|
| --- a/cc/playback/compositing_display_item.cc
|
| +++ b/cc/playback/compositing_display_item.cc
|
| @@ -17,14 +17,14 @@
|
| #include "third_party/skia/include/core/SkFlattenable.h"
|
| #include "third_party/skia/include/core/SkFlattenableSerialization.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| -#include "third_party/skia/include/core/SkXfermode.h"
|
| +
|
| #include "ui/gfx/skia_util.h"
|
|
|
| namespace cc {
|
|
|
| CompositingDisplayItem::CompositingDisplayItem(
|
| uint8_t alpha,
|
| - SkXfermode::Mode xfermode,
|
| + SkBlendMode xfermode,
|
| SkRect* bounds,
|
| sk_sp<SkColorFilter> cf,
|
| bool lcd_text_requires_opaque_layer) {
|
| @@ -38,7 +38,7 @@ CompositingDisplayItem::CompositingDisplayItem(
|
|
|
| const proto::CompositingDisplayItem& details = proto.compositing_item();
|
| uint8_t alpha = static_cast<uint8_t>(details.alpha());
|
| - SkXfermode::Mode xfermode = SkXfermodeModeFromProto(details.mode());
|
| + SkBlendMode xfermode = SkXfermodeModeFromProto(details.mode());
|
| std::unique_ptr<SkRect> bounds;
|
| if (details.has_bounds()) {
|
| bounds.reset(
|
| @@ -64,7 +64,7 @@ CompositingDisplayItem::~CompositingDisplayItem() {
|
| }
|
|
|
| void CompositingDisplayItem::SetNew(uint8_t alpha,
|
| - SkXfermode::Mode xfermode,
|
| + SkBlendMode xfermode,
|
| SkRect* bounds,
|
| sk_sp<SkColorFilter> cf,
|
| bool lcd_text_requires_opaque_layer) {
|
|
|