Always return ImageShader, even from SkShader::MakeBitmapShader

src/image/SkImageShader.h

Index: src/image/SkImageShader.h
diff --git a/src/image/SkImageShader.h b/src/image/SkImageShader.h
index 160de7ac9c4b7d38df4c03f613884cb82c01d623..e9911e6c2500ae124fd8927857a7f083d986cf8f 100644
--- a/src/image/SkImageShader.h
+++ b/src/image/SkImageShader.h
@@ -10,11 +10,12 @@
 
 #include "SkImage.h"
 #include "SkShader.h"
+#include "SkBitmapProcShader.h"
 
 class SkImageShader : public SkShader {
 public:
     static sk_sp<SkShader> Make(const SkImage*, TileMode tx, TileMode ty,
-                                const SkMatrix* localMatrix);
+                                const SkMatrix* localMatrix, SkTBlitterAllocator* = nullptr);
 
     bool isOpaque() const override;
 
@@ -25,6 +26,8 @@ public:
     sk_sp<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const override;
 #endif
 
+    SkImageShader(const SkImage*, TileMode tx, TileMode ty, const SkMatrix* localMatrix);

[f(malita), 2016/08/02 13:10:27]

Is there any magic registrar class we can befriend to avoid exposing the ctor?

+
 protected:
     void flatten(SkWriteBuffer&) const override;
     size_t onContextSize(const ContextRec&) const override;
@@ -37,7 +40,7 @@ protected:
     const TileMode              fTileModeY;
 
 private:
-    SkImageShader(const SkImage*, TileMode tx, TileMode ty, const SkMatrix* localMatrix);
+    friend class SkShader;
 
     typedef SkShader INHERITED;
 };