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

samplecode/SampleFilterFuzz.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 "SampleCode.h"
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkAlphaThresholdFilter.h"
@@ skipping 139 matching lines @@
 }
 
 static SkMatrix make_matrix() {
     SkMatrix m;
     for (int i = 0; i < 9; ++i) {
         m[i] = make_scalar();
     }
     return m;
 }
 
-static SkXfermode::Mode make_xfermode() {
-    return static_cast<SkXfermode::Mode>(R(SkXfermode::kLastMode+1));
+static SkBlendMode make_xfermode() {
+    return static_cast<SkBlendMode>(R(SkXfermode::kLastMode+1));
 }
 
 static SkPaint::Align make_paint_align() {
     return static_cast<SkPaint::Align>(R(SkPaint::kRight_Align+1));
 }
 
 static SkPaint::Hinting make_paint_hinting() {
     return static_cast<SkPaint::Hinting>(R(SkPaint::kFull_Hinting+1));
 }
 
@@ skipping 329 matching lines @@
     paint.setFakeBoldText(make_bool());
     paint.setDevKernText(make_bool());
     paint.setFilterQuality(make_filter_quality());
     paint.setStyle(make_paint_style());
     paint.setColor(make_color());
     paint.setStrokeWidth(make_scalar());
     paint.setStrokeMiter(make_scalar());
     paint.setStrokeCap(make_paint_cap());
     paint.setStrokeJoin(make_paint_join());
     paint.setColorFilter(make_color_filter());
-    paint.setXfermodeMode(make_xfermode());
+    paint.setBlendMode(make_xfermode());
     paint.setPathEffect(make_path_effect());
     paint.setMaskFilter(make_mask_filter());
 
     if (false) {
         // our validating buffer does not support typefaces yet, so skip this for now
         paint.setTypeface(SkTypeface::MakeFromName(make_font_name().c_str(),
                                                    make_typeface_style()));
     }
 
     SkLayerRasterizer::Builder rasterizerBuilder;
@@ skipping 29 matching lines @@
     switch (R(NUM_FILTERS)) {
     case ALPHA_THRESHOLD:
         filter = SkAlphaThresholdFilter::Make(make_region(),
                                               make_scalar(),
                                               make_scalar(),
                                               make_image_filter());
         break;
     case MERGE:
         filter = SkMergeImageFilter::Make(make_image_filter(),
                                           make_image_filter(),
-                                          make_xfermode());
+                                          (SkXfermode::Mode)make_xfermode());
         break;
     case COLOR: {
         sk_sp<SkColorFilter> cf(make_color_filter());
         filter = cf ? SkColorFilterImageFilter::Make(std::move(cf), make_image_filter())
                     : nullptr;
         break;
     }
     case LUT3D: {
         int cubeDimension;
         sk_sp<SkData> lut3D(make_3Dlut(&cubeDimension, (R(2) == 1), (R(2) == 1), (R(2) == 1)));
         sk_sp<SkColorFilter> cf(SkColorCubeFilter::Make(std::move(lut3D), cubeDimension));
         filter = cf ? SkColorFilterImageFilter::Make(std::move(cf), make_image_filter())
                     : nullptr;
         break;
     }
     case BLUR:
         filter = SkBlurImageFilter::Make(make_scalar(true),
                                          make_scalar(true),
                                          make_image_filter());
         break;
     case MAGNIFIER:
         filter = SkMagnifierImageFilter::Make(make_rect(),
                                               make_scalar(true),
                                               make_image_filter());
         break;
     case XFERMODE:
-        filter = SkXfermodeImageFilter::Make(SkXfermode::Make(make_xfermode()),
+        filter = SkXfermodeImageFilter::Make(make_xfermode(),
                                              make_image_filter(),
                                              make_image_filter(),
                                              nullptr);
         break;
     case OFFSET:
         filter = SkOffsetImageFilter::Make(make_scalar(), make_scalar(), make_image_filter());
         break;
     case MATRIX:
         filter = SkImageFilter::MakeMatrixFilter(make_matrix(),
                                                  (SkFilterQuality)R(4),
@@ skipping 227 matching lines @@
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ImageFilterFuzzView; }
 static SkViewRegister reg(MyFactory);