Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"

gm/lumafilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkLumaColorFilter.h"
 
 static SkScalar kSize   = 80;
 static SkScalar kInset  = 10;
 static SkColor  kColor1 = SkColorSetARGB(0xff, 0xff, 0xff, 0);
 static SkColor  kColor2 = SkColorSetARGB(0xff, 0x82, 0xff, 0);
 
 static void draw_label(SkCanvas* canvas, const char* label,
                        const SkPoint& offset) {
     SkPaint paint;
     sk_tool_utils::set_portable_typeface(&paint);
     size_t len = strlen(label);
 
     SkScalar width = paint.measureText(label, len);
     canvas->drawText(label, len, offset.x() - width / 2, offset.y(),
                      paint);
 }
 
-static void draw_scene(SkCanvas* canvas, const sk_sp<SkColorFilter>& filter, SkXfermode::Mode mode,
+static void draw_scene(SkCanvas* canvas, const sk_sp<SkColorFilter>& filter, SkBlendMode mode,
                        const sk_sp<SkShader>& s1, const sk_sp<SkShader>& s2) {
     SkPaint paint;
     paint.setAntiAlias(true);
     SkRect r, c, bounds = SkRect::MakeWH(kSize, kSize);
 
     c = bounds;
     c.fRight = bounds.centerX();
     paint.setARGB(0x20, 0, 0, 0xff);
     canvas->drawRect(bounds, paint);
 
     canvas->saveLayer(&bounds, nullptr);
 
     r = bounds;
     r.inset(kInset, 0);
     paint.setShader(s1);
     paint.setColor(s1 ? SK_ColorBLACK : SkColorSetA(kColor1, 0x80));
     canvas->drawOval(r, paint);
     if (!s1) {
         canvas->save();
         canvas->clipRect(c);
         paint.setColor(kColor1);
         canvas->drawOval(r, paint);
         canvas->restore();
     }
 
     SkPaint xferPaint;
-    xferPaint.setXfermodeMode(mode);
+    xferPaint.setBlendMode(mode);
     canvas->saveLayer(&bounds, &xferPaint);
 
     r = bounds;
     r.inset(0, kInset);
     paint.setShader(s2);
     paint.setColor(s2 ? SK_ColorBLACK : SkColorSetA(kColor2, 0x80));
     paint.setColorFilter(filter);
     canvas->drawOval(r, paint);
     if (!s2) {
         canvas->save();
@@ skipping 27 matching lines @@
 
     SkString onShortName() override {
         return SkString("lumafilter");
     }
 
     SkISize onISize() override {
         return SkISize::Make(600, 420);
     }
 
     void onDraw(SkCanvas* canvas) override {
-        SkXfermode::Mode modes[] = { SkXfermode::kSrcOver_Mode,
-                                     SkXfermode::kDstOver_Mode,
-                                     SkXfermode::kSrcATop_Mode,
-                                     SkXfermode::kDstATop_Mode,
-                                     SkXfermode::kSrcIn_Mode,
-                                     SkXfermode::kDstIn_Mode,
-                                   };
+        SkBlendMode modes[] = {
+            SkBlendMode::kSrcOver,
+            SkBlendMode::kDstOver,
+            SkBlendMode::kSrcATop,
+            SkBlendMode::kDstATop,
+            SkBlendMode::kSrcIn,
+            SkBlendMode::kDstIn,
+        };
         struct {
             const sk_sp<SkShader>& fShader1;
             const sk_sp<SkShader>& fShader2;
         } shaders[] = {
             { nullptr, nullptr },
             { nullptr, fGr2 },
             { fGr1, nullptr },
             { fGr1, fGr2 },
         };
 
@@ skipping 18 matching lines @@
 private:
     sk_sp<SkColorFilter>    fFilter;
     sk_sp<SkShader>         fGr1, fGr2;
 
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new LumaFilterGM;)