switch xfermodes over to sk_sp

src/core/SkComposeShader.h

Index: src/core/SkComposeShader.h
diff --git a/src/core/SkComposeShader.h b/src/core/SkComposeShader.h
index ee6e36a222b3a1161ecf971a0b203e48cac39af2..4d561faac76b8a035a037f2e3a8d38b8c69a2e39 100644
--- a/src/core/SkComposeShader.h
+++ b/src/core/SkComposeShader.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,13 +5,11 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkComposeShader_DEFINED
 #define SkComposeShader_DEFINED
 
 #include "SkShader.h"
-
-class SkXfermode;
+#include "SkXfermode.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -31,8 +28,11 @@ public:
         @param mode     The xfermode that combines the colors from the two shaders. If mode
                         is null, then SRC_OVER is assumed.
     */
-    SkComposeShader(sk_sp<SkShader> sA, sk_sp<SkShader> sB, SkXfermode* mode = NULL);
-    virtual ~SkComposeShader();
+    SkComposeShader(sk_sp<SkShader> sA, sk_sp<SkShader> sB, sk_sp<SkXfermode> mode)

[tomhudson, 2016/03/28 17:46:26]

Nit: Removed the default argument; will need to update callers?

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

This class is private (in src/core) so all the callers have been updated.

+        : fShaderA(std::move(sA))
+        , fShaderB(std::move(sB))
+        , fMode(std::move(mode))
+    {}
 
 #if SK_SUPPORT_GPU
     const GrFragmentProcessor*  asFragmentProcessor(GrContext*,
@@ -73,15 +73,15 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader)
 
 protected:
-    SkComposeShader(SkReadBuffer& );
+    SkComposeShader(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
     size_t onContextSize(const ContextRec&) const override;
     Context* onCreateContext(const ContextRec&, void*) const override;
 
 private:
-    sk_sp<SkShader> fShaderA;
-    sk_sp<SkShader> fShaderB;
-    SkXfermode*     fMode;
+    sk_sp<SkShader>     fShaderA;
+    sk_sp<SkShader>     fShaderB;
+    sk_sp<SkXfermode>   fMode;
 
     typedef SkShader INHERITED;
 };