remove xfermode from public api

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020

CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot

Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac
Reviewed-on: https://skia-review.googlesource.com/4020
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

9 files changed, 18 insertions, 16 deletions

diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp
index 713996c0ca..123e889d1b 100644
--- a/bench/BlurRoundRectBench.cpp
+++ b/bench/BlurRoundRectBench.cpp
@@ -45,7 +45,7 @@ public:
             SkLayerDrawLooper::LayerInfo info;
             info.fPaintBits = SkLayerDrawLooper::kMaskFilter_Bit
                               | SkLayerDrawLooper::kColorFilter_Bit;
-            info.fColorMode = SkXfermode::kSrc_Mode;
+            info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kSrc;
             info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0));
             info.fPostTranslate = false;
             SkPaint* paint = looperBuilder.addLayerOnTop(info);
@@ -53,7 +53,7 @@ public:
                                                         SkBlurMask::ConvertRadiusToSigma(0.5),
                                                         SkBlurMaskFilter::kHighQuality_BlurFlag));
             paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorLTGRAY,
-                                                                SkXfermode::kSrcIn_Mode));
+                                                                SkBlendMode::kSrcIn));
             paint->setColor(SK_ColorGRAY);
         }
         {
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index 7d942ced7a..40ec64456b 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -37,8 +37,7 @@ static sk_sp<SkImageFilter> make_grayscale(sk_sp<SkImageFilter> input) {
 }
 
 static sk_sp<SkImageFilter> make_mode_blue(sk_sp<SkImageFilter> input) {
-    sk_sp<SkColorFilter> filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE,
-                                                              SkXfermode::kSrcIn_Mode));
+    sk_sp<SkColorFilter> filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkBlendMode::kSrcIn));
     return SkColorFilterImageFilter::Make(std::move(filter), std::move(input));
 }
 
diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp
index 84da73eeca..9b811f0e23 100644
--- a/bench/GameBench.cpp
+++ b/bench/GameBench.cpp
@@ -201,8 +201,7 @@ protected:
                         { SkIntToScalar(src.fRight), SkIntToScalar(src.fBottom) },
                     };
                     canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
-                                         4, verts, uvs, nullptr, nullptr,
-                                         indices, 6, p2);
+                                         4, verts, uvs, nullptr, indices, 6, p2);
                 } else {
                     canvas->drawBitmapRect(fAtlas, src, dst, &p,
                                            SkCanvas::kFast_SrcRectConstraint);
diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp
index 60bcb62dd8..719e87b58d 100644
--- a/bench/ImageFilterDAGBench.cpp
+++ b/bench/ImageFilterDAGBench.cpp
@@ -31,11 +31,13 @@ protected:
         for (int j = 0; j < loops; j++) {
             sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr));
             sk_sp<SkImageFilter> inputs[kNumInputs];
+            SkBlendMode modes[kNumInputs];
             for (int i = 0; i < kNumInputs; ++i) {
                 inputs[i] = blur;
+                modes[i] = SkBlendMode::kSrcOver;
             }
             SkPaint paint;
-            paint.setImageFilter(SkMergeImageFilter::Make(inputs, kNumInputs));
+            paint.setImageFilter(SkMergeImageFilter::MakeN(inputs, kNumInputs, modes));
             canvas->drawRect(rect, paint);
         }
     }
@@ -68,10 +70,12 @@ protected:
         for (int j = 0; j < loops; j++) {
             sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr));
             sk_sp<SkImageFilter> inputs[kNumInputs];
+            SkBlendMode modes[kNumInputs];
             for (int i = 0; i < kNumInputs; ++i) {
                 inputs[i] = blur;
+                modes[i] = SkBlendMode::kSrcOver;
             }
-            sk_sp<SkImageFilter> mergeFilter = SkMergeImageFilter::Make(inputs, kNumInputs);
+            sk_sp<SkImageFilter> mergeFilter = SkMergeImageFilter::MakeN(inputs, kNumInputs, modes);
             image = image->makeWithFilter(mergeFilter.get(), subset, subset, &discardSubset,
                                           &offset);
             SkASSERT(image && image->dimensions() == fImage->dimensions());
diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp
index 70b4744784..8b6004df1b 100644
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -81,7 +81,7 @@ protected:
 private:
     sk_sp<SkImageFilter> mergeBitmaps() {
         return SkMergeImageFilter::Make(SkImageSource::Make(fCheckerboard),
-                                        SkImageSource::Make(fImage));
+                                        SkImageSource::Make(fImage), SkBlendMode::kSrcOver);
     }
 
     bool fIsSmall;
diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp
index f029584a45..d1d253bebe 100644
--- a/bench/PatchBench.cpp
+++ b/bench/PatchBench.cpp
@@ -127,16 +127,16 @@ protected:
         for (int i = 0; i < loops; i++) {
             switch (fVertexMode) {
                 case kNone_VertexMode:
-                    canvas->drawPatch(fCubics, nullptr, nullptr, nullptr, fPaint);
+                    canvas->drawPatch(fCubics, nullptr, nullptr, fPaint);
                     break;
                 case kColors_VertexMode:
-                    canvas->drawPatch(fCubics, fColors, nullptr, nullptr, fPaint);
+                    canvas->drawPatch(fCubics, fColors, nullptr, fPaint);
                     break;
                 case kTexCoords_VertexMode:
-                    canvas->drawPatch(fCubics, nullptr, fTexCoords, nullptr, fPaint);
+                    canvas->drawPatch(fCubics, nullptr, fTexCoords, fPaint);
                     break;
                 case kBoth_VertexMode:
-                    canvas->drawPatch(fCubics, fColors, fTexCoords, nullptr, fPaint);
+                    canvas->drawPatch(fCubics, fColors, fTexCoords, fPaint);
                     break;
                 default:
                     break;
diff --git a/bench/PatchGridBench.cpp b/bench/PatchGridBench.cpp
index db7865bb3b..9892658dcd 100644
--- a/bench/PatchGridBench.cpp
+++ b/bench/PatchGridBench.cpp
@@ -96,7 +96,7 @@ public:
         static const int kRows = 3;
         static const int kCols = 4;
 
-        fGrid.reset(kRows, kCols, SkPatchGrid::kColors_VertexType, nullptr);
+        fGrid.reset(kRows, kCols, SkPatchGrid::kColors_VertexType, SkBlendMode::kModulate);
         for (int i = 0; i < kRows; i++) {
             for (int j = 0; j < kCols; j++) {
                 SkPoint points[12];
diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp
index ad3d4c29ea..86304ae4f5 100644
--- a/bench/RectoriBench.cpp
+++ b/bench/RectoriBench.cpp
@@ -80,7 +80,7 @@ private:
         // TODO: add a color filter to better match what is seen in the wild
         info.fPaintBits = /* SkLayerDrawLooper::kColorFilter_Bit |*/
                           SkLayerDrawLooper::kMaskFilter_Bit;
-        info.fColorMode = SkXfermode::kDst_Mode;
+        info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kDst;
         info.fOffset.set(xOff, 0);
         info.fPostTranslate = false;
 
diff --git a/bench/VertBench.cpp b/bench/VertBench.cpp
index daff26ec08..0744f948ba 100644
--- a/bench/VertBench.cpp
+++ b/bench/VertBench.cpp
@@ -83,7 +83,7 @@ protected:
 
         for (int i = 0; i < loops; i++) {
             canvas->drawVertices(SkCanvas::kTriangles_VertexMode, PTS,
-                                 fPts, nullptr, fColors, nullptr, fIdx, IDX, paint);
+                                 fPts, nullptr, fColors, fIdx, IDX, paint);
         }
     }
 private: