sk_sp for gpu.

src/core/SkShader.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.
  */
 
 #include "SkAtomics.h"
 #include "SkBitmapProcShader.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"
 #include "SkMallocPixelRef.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureShader.h"
 #include "SkReadBuffer.h"
 #include "SkScalar.h"
 #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
     static int32_t gShaderCounter;
 #endif
 
 static inline void inc_shader_counter() {
 #ifdef SK_TRACK_SHADER_LIFETIME
     int32_t prev = sk_atomic_inc(&gShaderCounter);
     SkDebugf("+++ shader counter %d\n", prev + 1);
@@ skipping 182 matching lines @@
     }
     return mc;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 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;
 }
 
 SkShader* SkShader::refAsALocalMatrixShader(SkMatrix*) const {
     return nullptr;
 }
 
 sk_sp<SkShader> SkShader::MakeEmptyShader() { return sk_make_sp<SkEmptyShader>(); }
@@ skipping 56 matching lines @@
 }
 #endif
 
 #ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
 #include "SkXfermode.h"
 sk_sp<SkShader> SkShader::MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
                                             SkXfermode* xfer) {
     return MakeComposeShader(std::move(dst), std::move(src), sk_ref_sp(xfer));
 }
 #endif