stop using SkXfermode -- use SkBlendMode instead

skia/ext/benchmarking_canvas.cc

 // Copyright (c) 2013 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 "skia/ext/benchmarking_canvas.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 
+extern const char* SkBlendMode_Name(SkBlendMode);

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

Ditto.

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

Done.

+
 namespace {
 
 class FlagsBuilder {
 public:
   FlagsBuilder(char separator)
       : separator_(separator) {}
 
   void addFlag(bool flag_val, const char flag_name[]) {
     if (!flag_val)
       return;
@@ skipping 78 matching lines @@
   val->SetInteger("a", SkColorGetA(color));
   val->SetInteger("r", SkColorGetR(color));
   val->SetInteger("g", SkColorGetG(color));
   val->SetInteger("b", SkColorGetB(color));
 
   return std::move(val);
 }
 
 std::unique_ptr<base::Value> AsValue(SkBlendMode mode) {
   std::unique_ptr<base::StringValue> val(
-      new base::StringValue(SkXfermode::ModeName(mode)));
+      new base::StringValue(SkBlendMode_Name(mode)));
 
   return std::move(val);
 }
 
 std::unique_ptr<base::Value> AsValue(SkCanvas::PointMode mode) {
   static const char* gModeStrings[] = { "Points", "Lines", "Polygon" };
   DCHECK_LT(static_cast<size_t>(mode), SK_ARRAY_COUNT(gModeStrings));
 
   std::unique_ptr<base::StringValue> val(
       new base::StringValue(gModeStrings[mode]));
@@ skipping 581 matching lines @@
   DCHECK(blob);
   AutoOp op(this, "DrawTextBlob", &paint);
   op.addParam("blob", AsValue(*blob));
   op.addParam("x", AsValue(x));
   op.addParam("y", AsValue(y));
 
   INHERITED::onDrawTextBlob(blob, x, y, *op.paint());
 }
 
 } // namespace skia