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

src/pipe/SkPipeCanvas.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPathEffect.h"
 #include "SkColorFilter.h"
 #include "SkDrawLooper.h"
@@ skipping 63 matching lines @@
             bits |= (paint.getStrokeMiter() != kStrokeMiter_Default ? kStrokeMiter_NonDef : 0);
         }
     }
 
     if (usage &
         (kText_PaintUsage | kGeometry_PaintUsage | kImage_PaintUsage | kTextBlob_PaintUsage))
     {
         bits |= (paint.getMaskFilter()  ? kMaskFilter_NonDef : 0);
     }
 
-    bits |= (paint.getXfermode()    ? kXfermode_NonDef : 0);
     bits |= (paint.getColorFilter() ? kColorFilter_NonDef : 0);
     bits |= (paint.getImageFilter() ? kImageFilter_NonDef : 0);
     bits |= (paint.getDrawLooper()  ? kDrawLooper_NonDef : 0);
 
     return SkToU16(bits);
 }
 
 static uint32_t pack_paint_flags(unsigned flags, unsigned hint, unsigned align,
                                  unsigned filter, unsigned style, unsigned caps, unsigned joins,
                                  unsigned encoding) {
@@ skipping 48 matching lines @@
  *      pad zeros       : 8
  */
 static void write_paint(SkWriteBuffer& writer, const SkPaint& paint, unsigned usage) {
     uint32_t packedFlags = pack_paint_flags(paint.getFlags(), paint.getHinting(),
                                             paint.getTextAlign(), paint.getFilterQuality(),
                                             paint.getStyle(), paint.getStrokeCap(),
                                             paint.getStrokeJoin(), paint.getTextEncoding());
     writer.write32(packedFlags);
 
     unsigned nondef = compute_nondef(paint, (PaintUsage)usage);
-    SkXfermode::Mode mode;
-    if (SkXfermode::AsMode(paint.getXfermode(), &mode)) {
-        nondef &= ~kXfermode_NonDef;    // don't need to store a pointer since we have an enum
-    } else {
-        SkASSERT(nondef & kXfermode_NonDef);
-        mode = (SkXfermode::Mode)0;
-    }
     const uint8_t pad = 0;
-    writer.write32((nondef << 16) | ((unsigned)mode << 8) | pad);
+    writer.write32((nondef << 16) | ((unsigned)paint.getBlendMode() << 8) | pad);
 
     CHECK_WRITE_SCALAR(writer, nondef, paint, TextSize);
     CHECK_WRITE_SCALAR(writer, nondef, paint, TextScaleX);
     CHECK_WRITE_SCALAR(writer, nondef, paint, TextSkewX);
     CHECK_WRITE_SCALAR(writer, nondef, paint, StrokeWidth);
     CHECK_WRITE_SCALAR(writer, nondef, paint, StrokeMiter);
 
     if (nondef & kColor_NonDef) {
         writer.write32(paint.getColor());
     }
     if (nondef & kTypeface_NonDef) {
         // TODO: explore idea of writing bits indicating "use the prev (or prev N) face"
         // e.g. 1-N bits is an index into a ring buffer of typefaces
         SkTypeface* tf = paint.getTypeface();
         SkASSERT(tf);
         writer.writeTypeface(tf);
     }
 
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, PathEffect);
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, Shader);
-    CHECK_WRITE_FLATTENABLE(writer, nondef, paint, Xfermode);
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, MaskFilter);
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, ColorFilter);
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, Rasterizer);
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, ImageFilter);
     CHECK_WRITE_FLATTENABLE(writer, nondef, paint, DrawLooper);
 }
 
 class SkPipeWriter : public SkBinaryWriteBuffer {
     enum {
         N = 1024/4,
@@ skipping 876 matching lines @@
     fImpl->fDeduper.setStream(stream);
     fImpl->fDeduper.setCanvas(fImpl->fCanvas.get());
     return fImpl->fCanvas.get();
 }
 
 void SkPipeSerializer::endWrite() {
     fImpl->fCanvas->restoreToCount(1);
     fImpl->fCanvas.reset(nullptr);
     fImpl->fDeduper.setCanvas(nullptr);
 }