Index: cc/layers/layer.cc |
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc |
index 67c099c8253d242ff9b65d7b77a3a3fbabb05dba..7362df6c5cc3fbacd5acb720e65ce686d0a7d7ee 100644 |
--- a/cc/layers/layer.cc |
+++ b/cc/layers/layer.cc |
@@ -47,7 +47,7 @@ Layer::Inputs::Inputs(int layer_id) |
masks_to_bounds(false), |
mask_layer(nullptr), |
opacity(1.f), |
- blend_mode(SkXfermode::kSrcOver_Mode), |
+ blend_mode(SkBlendMode::kSrcOver), |
is_root_for_isolated_group(false), |
contents_opaque(false), |
is_drawable(false), |
@@ -97,7 +97,7 @@ Layer::Layer() |
subtree_property_changed_(false), |
may_contain_video_(false), |
safe_opaque_background_color_(0), |
- draw_blend_mode_(SkXfermode::kSrcOver_Mode), |
+ draw_blend_mode_(SkBlendMode::kSrcOver), |
num_unclipped_descendants_(0) {} |
Layer::~Layer() { |
@@ -498,7 +498,7 @@ bool Layer::AlwaysUseActiveTreeOpacity() const { |
return false; |
} |
-void Layer::SetBlendMode(SkXfermode::Mode blend_mode) { |
+void Layer::SetBlendMode(SkBlendMode blend_mode) { |
DCHECK(IsPropertyChangeAllowed()); |
if (inputs_.blend_mode == blend_mode) |
return; |
@@ -506,37 +506,37 @@ void Layer::SetBlendMode(SkXfermode::Mode blend_mode) { |
// Allowing only blend modes that are defined in the CSS Compositing standard: |
// http://dev.w3.org/fxtf/compositing-1/#blending |
switch (blend_mode) { |
- case SkXfermode::kSrcOver_Mode: |
- case SkXfermode::kScreen_Mode: |
- case SkXfermode::kOverlay_Mode: |
- case SkXfermode::kDarken_Mode: |
- case SkXfermode::kLighten_Mode: |
- case SkXfermode::kColorDodge_Mode: |
- case SkXfermode::kColorBurn_Mode: |
- case SkXfermode::kHardLight_Mode: |
- case SkXfermode::kSoftLight_Mode: |
- case SkXfermode::kDifference_Mode: |
- case SkXfermode::kExclusion_Mode: |
- case SkXfermode::kMultiply_Mode: |
- case SkXfermode::kHue_Mode: |
- case SkXfermode::kSaturation_Mode: |
- case SkXfermode::kColor_Mode: |
- case SkXfermode::kLuminosity_Mode: |
+ case SkBlendMode::kSrcOver: |
+ case SkBlendMode::kScreen: |
+ case SkBlendMode::kOverlay: |
+ case SkBlendMode::kDarken: |
+ case SkBlendMode::kLighten: |
+ case SkBlendMode::kColorDodge: |
+ case SkBlendMode::kColorBurn: |
+ case SkBlendMode::kHardLight: |
+ case SkBlendMode::kSoftLight: |
+ case SkBlendMode::kDifference: |
+ case SkBlendMode::kExclusion: |
+ case SkBlendMode::kMultiply: |
+ case SkBlendMode::kHue: |
+ case SkBlendMode::kSaturation: |
+ case SkBlendMode::kColor: |
+ case SkBlendMode::kLuminosity: |
// supported blend modes |
break; |
- case SkXfermode::kClear_Mode: |
- case SkXfermode::kSrc_Mode: |
- case SkXfermode::kDst_Mode: |
- case SkXfermode::kDstOver_Mode: |
- case SkXfermode::kSrcIn_Mode: |
- case SkXfermode::kDstIn_Mode: |
- case SkXfermode::kSrcOut_Mode: |
- case SkXfermode::kDstOut_Mode: |
- case SkXfermode::kSrcATop_Mode: |
- case SkXfermode::kDstATop_Mode: |
- case SkXfermode::kXor_Mode: |
- case SkXfermode::kPlus_Mode: |
- case SkXfermode::kModulate_Mode: |
+ case SkBlendMode::kClear: |
+ case SkBlendMode::kSrc: |
+ case SkBlendMode::kDst: |
+ case SkBlendMode::kDstOver: |
+ case SkBlendMode::kSrcIn: |
+ case SkBlendMode::kDstIn: |
+ case SkBlendMode::kSrcOut: |
+ case SkBlendMode::kDstOut: |
+ case SkBlendMode::kSrcATop: |
+ case SkBlendMode::kDstATop: |
+ case SkBlendMode::kXor: |
+ case SkBlendMode::kPlus: |
+ case SkBlendMode::kModulate: |
// Porter Duff Compositing Operators are not yet supported |
// http://dev.w3.org/fxtf/compositing-1/#porterduffcompositingoperators |
NOTREACHED(); |