switch xfermodes over to sk_sp

src/core/SkDraw.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #define __STDC_LIMIT_MACROS
 
 #include "SkDraw.h"
 #include "SkBlitter.h"
@@ skipping 14 matching lines @@
 #include "SkShader.h"
 #include "SkSmallAllocator.h"
 #include "SkString.h"
 #include "SkStroke.h"
 #include "SkStrokeRec.h"
 #include "SkTemplates.h"
 #include "SkTextMapStateProc.h"
 #include "SkTLazy.h"
 #include "SkUtils.h"
 #include "SkVertState.h"
+#include "SkXfermode.h"
 
 #include "SkBitmapProcShader.h"
 #include "SkDrawProcs.h"
 #include "SkMatrixUtils.h"
 
 //#define TRACE_BITMAP_DRAWS
 
 // Helper function to fix code gen bug on ARM64.
 // See SkFindAndPlaceGlyph.h for more details.
 void FixGCC49Arm64Bug(int v) { }
@@ skipping 1850 matching lines @@
     if (colors) {
         if (nullptr == textures) {
             // just colors (no texture)
             p.setShader(triShader);
             shader = p.getShader();
         } else {
             // colors * texture
             SkASSERT(shader);
             bool releaseMode = false;
             if (nullptr == xmode) {
-                xmode = SkXfermode::Create(SkXfermode::kModulate_Mode);
+                xmode = SkXfermode::Make(SkXfermode::kModulate_Mode).release();
                 releaseMode = true;
             }
-            p.setShader(sk_make_sp<SkComposeShader>(triShader, sk_ref_sp(shader), xmode));
+            p.setShader(SkShader::MakeComposeShader(triShader, sk_ref_sp(shader),
+                                                    sk_ref_sp(xmode)));
             if (releaseMode) {
                 xmode->unref();

[f(malita), 2016/03/28 18:44:59]

Nit: looks a bit convoluted, plus we unnecessarily ref/unref when creating a
local xmode.  How about something like this instead

  sk_sp<SkXferMode> mode = xmode
      ? sk_ref_sp(xmode)
      : SkXfermode::Make(SkXfermode::kModulate_Mode);
  p.setShader(SkShader::MakeComposeShader(..., std::move(mode));

[reed1, 2016/03/29 16:13:52]

Good suggestion. Done.

             }
         }
     }
 
     SkAutoBlitterChoose blitter(fDst, *fMatrix, p);
     // Abort early if we failed to create a shader context.
     if (blitter->isNullBlitter()) {
         return;
     }
 
@@ skipping 148 matching lines @@
         mask->fImage = SkMask::AllocImage(size);
         memset(mask->fImage, 0, mask->computeImageSize());
     }
 
     if (SkMask::kJustComputeBounds_CreateMode != mode) {
         draw_into_mask(*mask, devPath, style);
     }
 
     return true;
 }