switch xfermodes over to sk_sp

src/core/SkComposeShader.h

-
 /*
  * 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.
  */
 
-
 #ifndef SkComposeShader_DEFINED
 #define SkComposeShader_DEFINED
 
 #include "SkShader.h"
-
-class SkXfermode;
+#include "SkXfermode.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /** \class SkComposeShader
     This subclass of shader returns the composition of two other shaders, combined by
     a xfermode.
 */
 class SK_API SkComposeShader : public SkShader {
 public:
     /** Create a new compose shader, given shaders A, B, and a combining xfermode mode.
         When the xfermode is called, it will be given the result from shader A as its
         "dst", and the result from shader B as its "src".
         mode->xfer32(sA_result, sB_result, ...)
         @param shaderA  The colors from this shader are seen as the "dst" by the xfermode
         @param shaderB  The colors from this shader are seen as the "src" by the xfermode
         @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*,
                                                     const SkMatrix& viewM,
                                                     const SkMatrix* localMatrix,
                                                     SkFilterQuality) const override;
 #endif
 
     class ComposeShaderContext : public SkShader::Context {
     public:
@@ skipping 20 matching lines @@
     SkShader* getShaderA() { return fShaderA.get(); }
     SkShader* getShaderB() { return fShaderB.get(); }
 #endif
 
     bool asACompose(ComposeRec* rec) const override;
 
     SK_TO_STRING_OVERRIDE()
     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;
 };
 
 #endif