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

src/pipe/SkPipeReader.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 "SkCanvas.h"
 #include "SkDeduper.h"
 #include "SkPicture.h"
@@ skipping 131 matching lines @@
     }} while (0)
 
 /*
  *  Header:
  *      paint flags     : 32
  *      non_def bits    : 16
  *      xfermode enum   : 8
  *      pad zeros       : 8
  */
 static SkPaint read_paint(SkReadBuffer& reader) {
+    SkPaint paint;
+
     uint32_t packedFlags = reader.read32();
     uint32_t extra = reader.read32();
     unsigned nondef = extra >> 16;
-    SkXfermode::Mode mode = (SkXfermode::Mode)((extra >> 8) & 0xFF);
-    SkASSERT((extra & 0xFF) == 0);
-
-    SkPaint paint;
+    paint.setBlendMode(SkBlendMode((extra >> 8) & 0xFF));
+    SkASSERT((extra & 0xFF) == 0);  // zero pad byte
 
     packedFlags >>= 2;  // currently unused
     paint.setTextEncoding((SkPaint::TextEncoding)(packedFlags & 3));    packedFlags >>= 2;
     paint.setTextAlign((SkPaint::Align)(packedFlags & 3));              packedFlags >>= 2;
     paint.setHinting((SkPaint::Hinting)(packedFlags & 3));              packedFlags >>= 2;
     paint.setStrokeJoin((SkPaint::Join)(packedFlags & 3));              packedFlags >>= 2;
     paint.setStrokeCap((SkPaint::Cap)(packedFlags & 3));                packedFlags >>= 2;
     paint.setStyle((SkPaint::Style)(packedFlags & 3));                  packedFlags >>= 2;
     paint.setFilterQuality((SkFilterQuality)(packedFlags & 3));         packedFlags >>= 2;
     paint.setFlags(packedFlags);
 
     CHECK_SET_SCALAR(TextSize);
     CHECK_SET_SCALAR(TextScaleX);
     CHECK_SET_SCALAR(TextSkewX);
     CHECK_SET_SCALAR(StrokeWidth);
     CHECK_SET_SCALAR(StrokeMiter);
 
     if (nondef & kColor_NonDef) {
         paint.setColor(reader.read32());
     }
 
     CHECK_SET_FLATTENABLE(Typeface);
     CHECK_SET_FLATTENABLE(PathEffect);
     CHECK_SET_FLATTENABLE(Shader);
-    CHECK_SET_FLATTENABLE(Xfermode);
     CHECK_SET_FLATTENABLE(MaskFilter);
     CHECK_SET_FLATTENABLE(ColorFilter);
     CHECK_SET_FLATTENABLE(Rasterizer);
     CHECK_SET_FLATTENABLE(ImageFilter);
     CHECK_SET_FLATTENABLE(DrawLooper);
 
-    if (!(nondef & kXfermode_NonDef)) {
-        paint.setXfermodeMode(mode);
-    }
-
     return paint;
 }
 
 class SkPipeReader : public SkReadBuffer {
 public:
     SkPipeReader(SkPipeDeserializer* sink, const void* data, size_t size)
     : SkReadBuffer(data, size)
     , fSink(sink)
     {}
 
@@ skipping 754 matching lines @@
 
 bool SkPipeDeserializer::playback(const void* data, size_t size, SkCanvas* canvas) {
     SkPipeInflator inflator(&fImpl->fImages, &fImpl->fPictures,
                             &fImpl->fTypefaces, &fImpl->fFactories,
                             fImpl->fTFDeserializer);
     SkPipeReader reader(this, data, size);
     reader.setInflator(&inflator);
     return do_playback(reader, canvas);
 }