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..2d8197d030fdc273b2e9529a4a3d1903984ea8dc 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) { |
@@ -99,7 +99,7 @@ void CompositingDisplayItem::Raster( |
SkCanvas* canvas, |
SkPicture::AbortCallback* callback) const { |
SkPaint paint; |
- paint.setBlendMode(static_cast<SkBlendMode>(xfermode_)); |
+ paint.setBlendMode(xfermode_); |
paint.setAlpha(alpha_); |
paint.setColorFilter(color_filter_); |
const SkRect* bounds = has_bounds_ ? &bounds_ : nullptr; |
@@ -114,7 +114,7 @@ void CompositingDisplayItem::AsValueInto( |
base::trace_event::TracedValue* array) const { |
std::string info = base::StringPrintf( |
"CompositingDisplayItem alpha: %d, xfermode: %d, visualRect: [%s]", |
- alpha_, xfermode_, visual_rect.ToString().c_str()); |
+ alpha_, static_cast<int>(xfermode_), visual_rect.ToString().c_str()); |
if (has_bounds_) { |
base::StringAppendF( |
&info, ", bounds: [%f, %f, %f, %f]", static_cast<float>(bounds_.x()), |