stop using SkXfermode -- use SkBlendMode instead

cc/quads/shared_quad_state.cc

 // Copyright 2012 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/quads/shared_quad_state.h"
 
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/traced_value.h"
 
+extern const char* SkBlendMode_Name(SkBlendMode);

[f(malita), 2016/11/16 21:10:58]

Is this not declared in a public Skia header?

[reed1, 2016/11/16 21:31:17]

Just a placeholder until skia roll updates. Will be removed.

+
 namespace cc {
 
 SharedQuadState::SharedQuadState()
     : is_clipped(false),
       opacity(0.f),
-      blend_mode(SkXfermode::kSrcOver_Mode),
-      sorting_context_id(0) {
-}
+      blend_mode(SkBlendMode::kSrcOver),
+      sorting_context_id(0) {}
 
 SharedQuadState::SharedQuadState(const SharedQuadState& other) = default;
 
 SharedQuadState::~SharedQuadState() {
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"),
       "cc::SharedQuadState", this);
 }
 
 void SharedQuadState::SetAll(const gfx::Transform& quad_to_target_transform,
                              const gfx::Size& quad_layer_bounds,
                              const gfx::Rect& visible_quad_layer_rect,
                              const gfx::Rect& clip_rect,
                              bool is_clipped,
                              float opacity,
-                             SkXfermode::Mode blend_mode,
+                             SkBlendMode blend_mode,
                              int sorting_context_id) {
   this->quad_to_target_transform = quad_to_target_transform;
   this->quad_layer_bounds = quad_layer_bounds;
   this->visible_quad_layer_rect = visible_quad_layer_rect;
   this->clip_rect = clip_rect;
   this->is_clipped = is_clipped;
   this->opacity = opacity;
   this->blend_mode = blend_mode;
   this->sorting_context_id = sorting_context_id;
 }
 
 void SharedQuadState::AsValueInto(base::trace_event::TracedValue* value) const {
   MathUtil::AddToTracedValue("transform", quad_to_target_transform, value);
   MathUtil::AddToTracedValue("layer_content_bounds", quad_layer_bounds, value);
   MathUtil::AddToTracedValue("layer_visible_content_rect",
                              visible_quad_layer_rect, value);
 
   value->SetBoolean("is_clipped", is_clipped);
 
   MathUtil::AddToTracedValue("clip_rect", clip_rect, value);
 
   value->SetDouble("opacity", opacity);
-  value->SetString("blend_mode", SkXfermode::ModeName(blend_mode));
+  value->SetString("blend_mode", SkBlendMode_Name(blend_mode));
   TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"),
       value,
       "cc::SharedQuadState",
       this);
 }
 
 }  // namespace cc