Revert "Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://c…

src/core/SkPictureShader.h

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureShader_DEFINED
 #define SkPictureShader_DEFINED
 
 #include "SkShader.h"
 
 class SkBitmap;
 class SkPicture;
 
 /*
  * An SkPictureShader can be used to draw SkPicture-based patterns.
  *
  * The SkPicture is first rendered into a tile, which is then used to shade the area according
  * to specified tiling rules.
  */
 class SkPictureShader : public SkShader {
 public:
-    static sk_sp<SkShader> Make(sk_sp<const SkPicture>, TileMode, TileMode, const SkMatrix*,
+    static sk_sp<SkShader> Make(sk_sp<SkPicture>, TileMode, TileMode, const SkMatrix*,
                                 const SkRect*);
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader)
 
 #if SK_SUPPORT_GPU
     const GrFragmentProcessor* asFragmentProcessor(GrContext*,
                                                    const SkMatrix& viewM,
                                                    const SkMatrix*,
                                                    SkFilterQuality) const override;
 #endif
 
 protected:
     SkPictureShader(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
     size_t onContextSize(const ContextRec&) const override;
     Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
-    SkPictureShader(sk_sp<const SkPicture>, TileMode, TileMode, const SkMatrix*, const SkRect*);
+    SkPictureShader(sk_sp<SkPicture>, TileMode, TileMode, const SkMatrix*, const SkRect*);
 
     sk_sp<SkShader> refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix,
                                     const int maxTextureSize = 0) const;
 
-    sk_sp<const SkPicture>  fPicture;
-    SkRect                  fTile;
-    TileMode                fTmx, fTmy;
+    sk_sp<SkPicture>    fPicture;
+    SkRect              fTile;
+    TileMode            fTmx, fTmy;
 
     class PictureShaderContext : public SkShader::Context {
     public:
         static Context* Create(void* storage, const SkPictureShader&, const ContextRec&,
                                sk_sp<SkShader> bitmapShader);
 
         virtual ~PictureShaderContext();
 
         uint32_t getFlags() const override;
 
         ShadeProc asAShadeProc(void** ctx) override;
         void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
 
     private:
         PictureShaderContext(const SkPictureShader&, const ContextRec&,
                              sk_sp<SkShader> bitmapShader);
 
         sk_sp<SkShader>     fBitmapShader;
         SkShader::Context*  fBitmapShaderContext;
         void*               fBitmapShaderContextStorage;
 
         typedef SkShader::Context INHERITED;
     };
 
     typedef SkShader INHERITED;
 };
 
 #endif // SkPictureShader_DEFINED