stop using SkXfermode -- use SkBlendMode instead

cc/trees/property_tree_builder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/property_tree_builder.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 787 matching lines @@
 }
 
 static inline float Opacity(Layer* layer) {
   return layer->opacity();
 }
 
 static inline float Opacity(LayerImpl* layer) {
   return layer->test_properties()->opacity;
 }
 
-static inline SkXfermode::Mode BlendMode(Layer* layer) {
+static inline SkBlendMode BlendMode(Layer* layer) {
   return layer->blend_mode();
 }
 
-static inline SkXfermode::Mode BlendMode(LayerImpl* layer) {
+static inline SkBlendMode BlendMode(LayerImpl* layer) {
   return layer->test_properties()->blend_mode;
 }
 
 static inline const FilterOperations& Filters(Layer* layer) {
   return layer->filters();
 }
 
 static inline const gfx::PointF FiltersOrigin(Layer* layer) {
   return layer->filters_origin();
 }
@@ skipping 82 matching lines @@
     TRACE_EVENT_INSTANT0(
         "cc", "PropertyTreeBuilder::ShouldCreateRenderSurface flattening",
         TRACE_EVENT_SCOPE_THREAD);
     return true;
   }
 
   // If the layer has blending.
   // TODO(rosca): this is temporary, until blending is implemented for other
   // types of quads than RenderPassDrawQuad. Layers having descendants that draw
   // content will still create a separate rendering surface.
-  if (BlendMode(layer) != SkXfermode::kSrcOver_Mode) {
+  if (BlendMode(layer) != SkBlendMode::kSrcOver) {
     TRACE_EVENT_INSTANT0(
         "cc", "PropertyTreeBuilder::ShouldCreateRenderSurface blending",
         TRACE_EVENT_SCOPE_THREAD);
     return true;
   }
   // If the layer clips its descendants but it is not axis-aligned with respect
   // to its parent.
   bool layer_clips_external_content = LayerClipsSubtree(layer);
   if (layer_clips_external_content && !preserves_2d_axis_alignment &&
       num_descendants_that_draw_content > 0) {
@@ skipping 311 matching lines @@
   layer->set_property_tree_sequence_number(
       data_from_parent.property_trees->sequence_number);
 
   DataForRecursion<LayerType> data_for_children(data_from_parent);
 
   bool created_render_surface =
       AddEffectNodeIfNeeded(data_from_parent, layer, &data_for_children);
 
   if (created_render_surface) {
     data_for_children.render_target = data_for_children.effect_tree_parent;
-    layer->set_draw_blend_mode(SkXfermode::kSrcOver_Mode);
+    layer->set_draw_blend_mode(SkBlendMode::kSrcOver);
   } else {
     layer->set_draw_blend_mode(BlendMode(layer));
   }
 
   bool created_transform_node = AddTransformNodeIfNeeded(
       data_from_parent, layer, created_render_surface, &data_for_children);
   AddClipNodeIfNeeded(data_from_parent, layer, created_render_surface,
                       created_transform_node, &data_for_children);
 
   AddScrollNodeIfNeeded(data_from_parent, layer, &data_for_children);
@@ skipping 238 matching lines @@
     color = SkColorSetA(color, 255);
   BuildPropertyTreesTopLevelInternal(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, overscroll_elasticity_layer,
       elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
       device_transform, property_trees, color);
   property_trees->ResetCachedData();
 }
 
 }  // namespace cc