sk_sp for gpu.

src/core/SkShader.cpp

Index: src/core/SkShader.cpp
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 2ec3b0b6613d0ecea798458bf1ae138bfe3a3463..2205d7d94b6c4c556d9f93e329406ab03edd2d97 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -18,6 +18,8 @@
 #include "SkShader.h"
 #include "SkWriteBuffer.h"
 
+#include "GrFragmentProcessor.h"

[bungeman-skia, 2016/06/08 18:22:16]

Hmmm... not sure this is valid in a cpp file without guards.
However, we need to have a sk_sp<GrFragmentProcessor> to return, which means
GrFragmentProcessor->unref() needs to exist to compile time.

This need for complete types is annoying.

[bsalomon, 2016/06/08 19:50:50]

I suppose that if this is a problem we could do a "using GrFragmentProcessor = 
SkRefCnt;" in the non-GPU build.

+
 //#define SK_TRACK_SHADER_LIFETIME
 
 #ifdef SK_TRACK_SHADER_LIFETIME
@@ -220,7 +222,7 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
     return kNone_GradientType;
 }
 
-const GrFragmentProcessor* SkShader::asFragmentProcessor(GrContext*, const SkMatrix&,
+sk_sp<GrFragmentProcessor> SkShader::asFragmentProcessor(GrContext*, const SkMatrix&,
                                                          const SkMatrix*, SkFilterQuality,
                                                          SkSourceGammaTreatment)  const {
     return nullptr;