remove 4 legacy flags (clients already updated)

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3785

Change-Id: I187e50e09ed7a3316719fae51af770259928fdf9
Reviewed-on: https://skia-review.googlesource.com/3785
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

40 files changed, 1 insertions, 510 deletions

diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 5a23a343a2..485739842a 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -134,21 +134,6 @@ public:
      */
     static sk_sp<SkColorFilter> MakeMatrixFilterRowMajor255(const SkScalar array[20]);
 
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* CreateModeFilter(SkColor c, SkXfermode::Mode mode) {
-        return MakeModeFilter(c, mode).release();
-    }
-    static SkColorFilter* CreateComposeFilter(SkColorFilter* outer, SkColorFilter* inner) {
-        return MakeComposeFilter(sk_ref_sp(outer), sk_ref_sp(inner)).release();
-    }
-    static SkColorFilter* CreateMatrixFilterRowMajor255(const SkScalar array[20]) {
-        return MakeMatrixFilterRowMajor255(array).release();
-    }
-    virtual SkColorFilter* newComposed(const SkColorFilter* inner) const {
-        return this->makeComposed(sk_ref_sp(const_cast<SkColorFilter*>(inner))).release();
-    }
-#endif
-
 #if SK_SUPPORT_GPU
     /**
      *  A subclass may implement this factory function to work with the GPU backend. It returns
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 1f9d9f8348..b67f0a3d09 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -176,11 +176,6 @@ public:
     bool readYUV8Planes(const SkISize[3], void* const planes[3], const size_t rowBytes[3],
                         SkYUVColorSpace) const;
 
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-    SkShader* newShader(SkShader::TileMode, SkShader::TileMode,
-                        const SkMatrix* localMatrix = nullptr) const;
-#endif
-
     sk_sp<SkShader> makeShader(SkShader::TileMode, SkShader::TileMode,
                                const SkMatrix* localMatrix = nullptr) const;
 
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index 9188a89e27..c2d7261196 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -223,12 +223,6 @@ public:
      */
     sk_sp<SkImageFilter> makeWithLocalMatrix(const SkMatrix&) const;
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const {
-        return this->makeWithLocalMatrix(matrix).release();
-    }
-#endif
-
     /**
      *  ImageFilters can natively handle scaling and translate components in the CTM. Only some of
      *  them can handle affine (or more complex) matrices. This call returns true iff the filter
@@ -243,14 +237,6 @@ public:
                                                  SkFilterQuality quality,
                                                  sk_sp<SkImageFilter> input);
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* CreateMatrixFilter(const SkMatrix& matrix,
-                                             SkFilterQuality filterQuality,
-                                             SkImageFilter* input = nullptr) {
-        return MakeMatrixFilter(matrix, filterQuality, sk_ref_sp<SkImageFilter>(input)).release();
-    }
-#endif
-
     SK_TO_STRING_PUREVIRT()
     SK_DEFINE_FLATTENABLE_TYPE(SkImageFilter)
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index ddc90ae19c..2e4f2f9edd 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -503,12 +503,8 @@ public:
      *  If a previous shader exists, its reference count is decremented.
      *  If shader is not NULL, its reference count is incremented.
      *  @param shader   May be NULL. The shader to be installed in the paint
-     *  @return         shader
      */
     void setShader(sk_sp<SkShader>);
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-    SkShader* setShader(SkShader* shader);
-#endif
 
     /** Get the paint's colorfilter. If there is a colorfilter, its reference
         count is not changed.
@@ -516,16 +512,12 @@ public:
     */
     SkColorFilter* getColorFilter() const { return fColorFilter.get(); }
 
-    /** Set or clear the paint's colorfilter, returning the parameter.
+    /** Set or clear the paint's colorfilter.
         <p />
         If the paint already has a filter, its reference count is decremented.
         If filter is not NULL, its reference count is incremented.
         @param filter   May be NULL. The filter to be installed in the paint
-        @return         filter
     */
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    SkColorFilter* setColorFilter(SkColorFilter* filter);
-#endif
     void setColorFilter(sk_sp<SkColorFilter>);
 
 #ifdef SK_SUPPORT_LEGACY_XFERMODE_OBJECT
@@ -544,12 +536,8 @@ public:
         If xfermode is not NULL, its reference count is incremented.
         @param xfermode May be NULL. The new xfermode to be installed in the
                         paint
-        @return         xfermode
     */
     void setXfermode(sk_sp<SkXfermode>);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    SkXfermode* setXfermode(SkXfermode* xfermode);
-#endif
 
     /** Create an xfermode based on the specified Mode, and assign it into the
         paint, returning the mode that was set. If the Mode is SrcOver, then
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index f9796d6c1a..161e6081dd 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -423,24 +423,6 @@ public:
     static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
                                              SkXfermode::Mode);
 
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-    static SkShader* CreateEmptyShader() { return MakeEmptyShader().release(); }
-    static SkShader* CreateColorShader(SkColor c) { return MakeColorShader(c).release(); }
-    static SkShader* CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy,
-                                        const SkMatrix* localMatrix = nullptr) {
-        return MakeBitmapShader(src, tmx, tmy, localMatrix).release();
-    }
-    static SkShader* CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode::Mode mode);
-    static SkShader* CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode* xfer);
-    static SkShader* CreatePictureShader(const SkPicture* src, TileMode tmx, TileMode tmy,
-                                         const SkMatrix* localMatrix, const SkRect* tile);
-
-    SkShader* newWithLocalMatrix(const SkMatrix& matrix) const {
-        return this->makeWithLocalMatrix(matrix).release();
-    }
-    SkShader* newWithColorFilter(SkColorFilter* filter) const;
-#endif
-
     /**
      *  Create a new compose shader, given shaders dst, src, and a combining xfermode mode.
      *  The xfermode is called with the output of the two shaders, and its output is returned.
@@ -450,10 +432,6 @@ public:
      */
     static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
                                              sk_sp<SkXfermode> xfer);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
-                                             SkXfermode* xfer);
-#endif
 
     /** Call this to create a new shader that will draw with the specified bitmap.
      *
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index 253ee1b408..82036dfc39 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -153,15 +153,6 @@ public:
     /** Return an SkXfermode object for the specified mode.
      */
     static sk_sp<SkXfermode> Make(Mode);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    static SkXfermode* Create(Mode mode) {
-        return Make(mode).release();
-    }
-    SK_ATTR_DEPRECATED("use AsMode(...)")
-    static bool IsMode(const SkXfermode* xfer, Mode* mode) {
-        return AsMode(xfer, mode);
-    }
-#endif
 
     /**
      *  Skia maintains global xfermode objects corresponding to each BlendMode. This returns a
diff --git a/include/effects/SkAlphaThresholdFilter.h b/include/effects/SkAlphaThresholdFilter.h
index 18b760fc9f..9bb69f004d 100644
--- a/include/effects/SkAlphaThresholdFilter.h
+++ b/include/effects/SkAlphaThresholdFilter.h
@@ -26,13 +26,6 @@ public:
                                      const SkImageFilter::CropRect* cropRect = nullptr);
 
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkRegion& region, SkScalar innerMin,
-                                 SkScalar outerMax, SkImageFilter* input = nullptr) {
-        return Make(region, innerMin, outerMax, sk_ref_sp<SkImageFilter>(input)).release();
-    }
-#endif
-
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();
 };
 
diff --git a/include/effects/SkArithmeticMode.h b/include/effects/SkArithmeticMode.h
index 81b9f85394..e00ea32cc4 100644
--- a/include/effects/SkArithmeticMode.h
+++ b/include/effects/SkArithmeticMode.h
@@ -25,13 +25,6 @@ public:
      */
     static sk_sp<SkXfermode> Make(SkScalar k1, SkScalar k2, SkScalar k3, SkScalar k4,
                                   bool enforcePMColor = true);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    static SkXfermode* Create(SkScalar k1, SkScalar k2,
-                              SkScalar k3, SkScalar k4,
-                              bool enforcePMColor = true) {
-        return Make(k1, k2, k3, k4, enforcePMColor).release();
-    }
-#endif
 
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();
 
diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h
index e2109d0561..085a13b5b3 100644
--- a/include/effects/SkBlurImageFilter.h
+++ b/include/effects/SkBlurImageFilter.h
@@ -17,15 +17,6 @@ public:
                                      const SkImageFilter::CropRect* cropRect = nullptr) {
         return SkImageFilter::MakeBlur(sigmaX, sigmaY, input, cropRect);
     }
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkScalar sigmaX, SkScalar sigmaY,
-                                 SkImageFilter * input = nullptr,
-                                 const SkImageFilter::CropRect* cropRect = nullptr) {
-        return SkImageFilter::MakeBlur(sigmaX, sigmaY, sk_ref_sp<SkImageFilter>(input),
-                                       cropRect).release();
-    }
-#endif
 };
 
 #endif
diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h
index fbfe698ba8..f30371de46 100644
--- a/include/effects/SkColorCubeFilter.h
+++ b/include/effects/SkColorCubeFilter.h
@@ -22,10 +22,6 @@ public:
      */
     static sk_sp<SkColorFilter> Make(sk_sp<SkData> cubeData, int cubeDimension);
 
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* Create(SkData* cubeData, int cubeDimension);
-#endif
-
     void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
     uint32_t getFlags() const override;
 
diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h
index 4d438e3519..7255ba0ac5 100644
--- a/include/effects/SkColorFilterImageFilter.h
+++ b/include/effects/SkColorFilterImageFilter.h
@@ -21,16 +21,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkColorFilter* cf,
-                                 SkImageFilter* input = NULL,
-                                 const CropRect* cropRect = NULL) {
-        return Make(sk_ref_sp<SkColorFilter>(cf),
-                    sk_ref_sp<SkImageFilter>(input),
-                    cropRect).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index 6e74bee315..c2937176cc 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -20,18 +20,6 @@ public:
      *  are ignored.
      */
     static sk_sp<SkColorFilter> MakeLightingFilter(SkColor mul, SkColor add);
-
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* Create(const SkColorMatrix& cm) {
-        return SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat).release();
-    }
-    static SkColorFilter* Create(const SkScalar array[20]) {
-        return SkColorFilter::MakeMatrixFilterRowMajor255(array).release();
-    }
-    static SkColorFilter* CreateLightingFilter(SkColor mul, SkColor add) {
-        return MakeLightingFilter(mul, add).release();
-    }
-#endif
 };
 
 #endif
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index 378b90471b..48757a7569 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -19,13 +19,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
-        return Make(sk_ref_sp<SkImageFilter>(outer),
-                    sk_ref_sp<SkImageFilter>(inner)).release();
-    }
-#endif
-
 protected:
     explicit SkComposeImageFilter(sk_sp<SkImageFilter> inputs[2]) : INHERITED(inputs, 2, nullptr) {
         SkASSERT(inputs[0].get());
diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
index f93f2c4454..72c70a1f8c 100644
--- a/include/effects/SkDisplacementMapEffect.h
+++ b/include/effects/SkDisplacementMapEffect.h
@@ -39,19 +39,6 @@ public:
 
     SK_TO_STRING_OVERRIDE()
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(ChannelSelectorType xChannelSelector,
-                                 ChannelSelectorType yChannelSelector,
-                                 SkScalar scale, SkImageFilter* displacement,
-                                 SkImageFilter* color = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        return Make(xChannelSelector, yChannelSelector, scale, 
-                    sk_ref_sp<SkImageFilter>(displacement),
-                    sk_ref_sp<SkImageFilter>(color),
-                    cropRect).release();
-    }
-#endif
-
 protected:
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
                                         SkIPoint* offset) const override;
diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h
index 87e7406829..aaa8b096d9 100644
--- a/include/effects/SkDropShadowImageFilter.h
+++ b/include/effects/SkDropShadowImageFilter.h
@@ -32,16 +32,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY,
-                                 SkColor color, ShadowMode shadowMode,
-                                 SkImageFilter* input = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        return Make(dx, dy, sigmaX, sigmaY, color, shadowMode,
-                    sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/include/effects/SkGammaColorFilter.h b/include/effects/SkGammaColorFilter.h
index 308926a3ab..b98838eb8f 100644
--- a/include/effects/SkGammaColorFilter.h
+++ b/include/effects/SkGammaColorFilter.h
@@ -22,10 +22,6 @@ class SK_API SkGammaColorFilter : public SkColorFilter {
 public:
     static sk_sp<SkColorFilter> Make(SkScalar gamma);
 
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* Create(SkScalar gamma) { return Make(gamma).release(); }
-#endif
-
     void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
 
 #if SK_SUPPORT_GPU
diff --git a/include/effects/SkGradientShader.h b/include/effects/SkGradientShader.h
index 2fcce75c30..393749be65 100644
--- a/include/effects/SkGradientShader.h
+++ b/include/effects/SkGradientShader.h
@@ -198,60 +198,6 @@ public:
         return MakeSweep(cx, cy, colors, std::move(colorSpace), pos, count, 0, NULL);
     }
 
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-    static SkShader* CreateLinear(const SkPoint pts[2],
-                                  const SkColor colors[], const SkScalar pos[], int count,
-                                  SkShader::TileMode mode,
-                                  uint32_t flags, const SkMatrix* localMatrix) {
-        return MakeLinear(pts, colors, pos, count, mode, flags, localMatrix).release();
-    }
-    static SkShader* CreateLinear(const SkPoint pts[2],
-                                  const SkColor colors[], const SkScalar pos[], int count,
-                                  SkShader::TileMode mode) {
-        return CreateLinear(pts, colors, pos, count, mode, 0, NULL);
-    }
-
-    static SkShader* CreateRadial(const SkPoint& center, SkScalar radius,
-                                  const SkColor colors[], const SkScalar pos[], int count,
-                                  SkShader::TileMode mode,
-                                  uint32_t flags, const SkMatrix* localMatrix) {
-        return MakeRadial(center, radius, colors, pos, count, mode, flags, localMatrix).release();
-    }
-    
-    static SkShader* CreateRadial(const SkPoint& center, SkScalar radius,
-                                  const SkColor colors[], const SkScalar pos[], int count,
-                                  SkShader::TileMode mode) {
-        return CreateRadial(center, radius, colors, pos, count, mode, 0, NULL);
-    }
-
-    static SkShader* CreateTwoPointConical(const SkPoint& start, SkScalar startRadius,
-                                           const SkPoint& end, SkScalar endRadius,
-                                           const SkColor colors[], const SkScalar pos[], int count,
-                                           SkShader::TileMode mode,
-                                           uint32_t flags, const SkMatrix* localMatrix) {
-        return MakeTwoPointConical(start, startRadius, end, endRadius, colors, pos, count, mode,
-                                   flags, localMatrix).release();
-    }
-    static SkShader* CreateTwoPointConical(const SkPoint& start, SkScalar startRadius,
-                                           const SkPoint& end, SkScalar endRadius,
-                                           const SkColor colors[], const SkScalar pos[], int count,
-                                           SkShader::TileMode mode) {
-        return CreateTwoPointConical(start, startRadius, end, endRadius, colors, pos, count, mode,
-                                     0, NULL);
-    }
-    
-    static SkShader* CreateSweep(SkScalar cx, SkScalar cy,
-                                 const SkColor colors[], const SkScalar pos[], int count,
-                                 uint32_t flags, const SkMatrix* localMatrix) {
-        return MakeSweep(cx, cy, colors, pos, count, flags, localMatrix).release();
-    }
-    static SkShader* CreateSweep(SkScalar cx, SkScalar cy,
-                                 const SkColor colors[], const SkScalar pos[], int count) {
-        return CreateSweep(cx, cy, colors, pos, count, 0, NULL);
-    }
-#endif
-    
-
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 };
 
diff --git a/include/effects/SkImageSource.h b/include/effects/SkImageSource.h
index 4ceff95668..6953497ea7 100644
--- a/include/effects/SkImageSource.h
+++ b/include/effects/SkImageSource.h
@@ -24,18 +24,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageSource)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkImage* image) {
-        return Make(sk_ref_sp<SkImage>(image)).release();
-    }
-    static SkImageFilter* Create(SkImage* image,
-                                 const SkRect& srcRect,
-                                 const SkRect& dstRect,
-                                 SkFilterQuality filterQuality) {
-        return Make(sk_ref_sp<SkImage>(image), srcRect, dstRect, filterQuality).release();
-   }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
 
diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h
index 4d4785da2e..19aca62bb6 100644
--- a/include/effects/SkLightingImageFilter.h
+++ b/include/effects/SkLightingImageFilter.h
@@ -41,49 +41,6 @@ public:
 
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-     static SkImageFilter* CreateDistantLitDiffuse(const SkPoint3& direction,
-        SkColor lightColor, SkScalar surfaceScale, SkScalar kd,
-        SkImageFilter* input = NULL, const CropRect* cropRect = NULL) {
-        return MakeDistantLitDiffuse(direction, lightColor, surfaceScale, kd,
-                                     sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-    static SkImageFilter* CreatePointLitDiffuse(const SkPoint3& location,
-        SkColor lightColor, SkScalar surfaceScale, SkScalar kd,
-        SkImageFilter* input = NULL, const CropRect* cropRect = NULL) {
-        return MakePointLitDiffuse(location, lightColor, surfaceScale, kd,
-                                   sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-    static SkImageFilter* CreateSpotLitDiffuse(const SkPoint3& location,
-        const SkPoint3& target, SkScalar specularExponent, SkScalar cutoffAngle,
-        SkColor lightColor, SkScalar surfaceScale, SkScalar kd,
-        SkImageFilter* input = NULL, const CropRect* cropRect = NULL) {
-        return MakeSpotLitDiffuse(location, target, specularExponent, cutoffAngle,
-                                  lightColor, surfaceScale, kd,
-                                  sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-    static SkImageFilter* CreateDistantLitSpecular(const SkPoint3& direction,
-        SkColor lightColor, SkScalar surfaceScale, SkScalar ks,
-        SkScalar shininess, SkImageFilter* input = NULL, const CropRect* cropRect = NULL) {
-        return MakeDistantLitSpecular(direction, lightColor, surfaceScale, ks, shininess,
-                                      sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-    static SkImageFilter* CreatePointLitSpecular(const SkPoint3& location,
-        SkColor lightColor, SkScalar surfaceScale, SkScalar ks,
-        SkScalar shininess, SkImageFilter* input = NULL, const CropRect* cropRect = NULL) {
-        return MakePointLitSpecular(location, lightColor, surfaceScale, ks, shininess,
-                                    sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-    static SkImageFilter* CreateSpotLitSpecular(const SkPoint3& location,
-        const SkPoint3& target, SkScalar specularExponent, SkScalar cutoffAngle,
-        SkColor lightColor, SkScalar surfaceScale, SkScalar ks,
-        SkScalar shininess, SkImageFilter* input = NULL, const CropRect* cropRect = NULL) {
-        return MakeSpotLitSpecular(location, target, specularExponent, cutoffAngle,
-                                   lightColor, surfaceScale, ks, shininess,
-                                   sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-#endif
-
 protected:
     SkLightingImageFilter(sk_sp<SkImageFilterLight> light,
                           SkScalar surfaceScale,
diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h
index 1ffaa733b2..ac4afa2bfc 100644
--- a/include/effects/SkLumaColorFilter.h
+++ b/include/effects/SkLumaColorFilter.h
@@ -26,10 +26,6 @@ class SK_API SkLumaColorFilter : public SkColorFilter {
 public:
     static sk_sp<SkColorFilter> Make();
 
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* Create() { return Make().release(); }
-#endif
-
     void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
 
 #if SK_SUPPORT_GPU
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h
index 6e20297ff4..b110dda087 100644
--- a/include/effects/SkMagnifierImageFilter.h
+++ b/include/effects/SkMagnifierImageFilter.h
@@ -21,13 +21,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkRect& src, SkScalar inset,
-                                 SkImageFilter* input = nullptr) {
-        return Make(src, inset, sk_ref_sp<SkImageFilter>(input)).release();
-    }
-#endif
-
 protected:
     SkMagnifierImageFilter(const SkRect& srcRect,
                            SkScalar inset,
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h
index 9a45486d88..a18898dccf 100644
--- a/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/include/effects/SkMatrixConvolutionImageFilter.h
@@ -67,21 +67,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkISize& kernelSize,
-                                 const SkScalar* kernel,
-                                 SkScalar gain,
-                                 SkScalar bias,
-                                 const SkIPoint& kernelOffset,
-                                 TileMode tileMode,
-                                 bool convolveAlpha,
-                                 SkImageFilter* input = NULL,
-                                 const CropRect* cropRect = NULL) {
-        return Make(kernelSize, kernel, gain, bias, kernelOffset, tileMode, convolveAlpha,
-                    sk_ref_sp<SkImageFilter>(input), cropRect).release();
-    }
-#endif
-
 protected:
     SkMatrixConvolutionImageFilter(const SkISize& kernelSize,
                                    const SkScalar* kernel,
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 20620d6d7e..5dfa578df8 100644
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -27,26 +27,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkImageFilter* first, SkImageFilter* second,
-                                 SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
-                                 const CropRect* cropRect = nullptr) {
-        return Make(sk_ref_sp<SkImageFilter>(first),
-                    sk_ref_sp<SkImageFilter>(second),
-                    mode, cropRect).release();
-    }
-
-    static SkImageFilter* Create(SkImageFilter* filters[], int count,
-                                 const SkXfermode::Mode modes[] = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        SkAutoTDeleteArray<sk_sp<SkImageFilter>> temp(new sk_sp<SkImageFilter>[count]);
-        for (int i = 0; i < count; ++i) {
-            temp[i] = sk_ref_sp<SkImageFilter>(filters[i]);
-        }
-        return Make(temp.get(), count, modes, cropRect).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index fbbbe207ab..57413f230e 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -62,16 +62,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(int radiusX, int radiusY,
-                                 SkImageFilter* input = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        return Make(radiusX, radiusY,
-                    sk_ref_sp<SkImageFilter>(input),
-                    cropRect).release();
-    }
-#endif
-
 protected:
     Op op() const override { return kDilate_Op; }
 
@@ -94,16 +84,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(int radiusX, int radiusY,
-                                 SkImageFilter* input = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        return Make(radiusX, radiusY,
-                    sk_ref_sp<SkImageFilter>(input),
-                    cropRect).release();
-    }
-#endif
-
 protected:
     Op op() const override { return kErode_Op; }
 
diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h
index c1005ef780..cc3ccbf489 100644
--- a/include/effects/SkOffsetImageFilter.h
+++ b/include/effects/SkOffsetImageFilter.h
@@ -22,13 +22,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkImageFilter* input = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        return Make(dx, dy, sk_ref_sp(input), cropRect).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/include/effects/SkPaintImageFilter.h b/include/effects/SkPaintImageFilter.h
index 8a59da6c66..36a3097600 100644
--- a/include/effects/SkPaintImageFilter.h
+++ b/include/effects/SkPaintImageFilter.h
@@ -29,12 +29,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPaintImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkPaint& paint, const CropRect* rect = nullptr) {
-        return Make(paint, rect).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h
index 60dc53a6a2..45d4367adb 100644
--- a/include/effects/SkPerlinNoiseShader.h
+++ b/include/effects/SkPerlinNoiseShader.h
@@ -62,24 +62,6 @@ public:
                                           int numOctaves, SkScalar seed,
                                           const SkISize* tileSize = nullptr);
 
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-    static SkShader* CreateFractalNoise(SkScalar baseFrequencyX, SkScalar baseFrequencyY,
-                                        int numOctaves, SkScalar seed,
-                                        const SkISize* tileSize = NULL) {
-        return MakeFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed, tileSize).release();
-    }
-    static SkShader* CreateTurbulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY,
-                                      int numOctaves, SkScalar seed,
-                                      const SkISize* tileSize = NULL) {
-        return MakeTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, tileSize).release();
-    }
-    static SkShader* CreateTubulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY,
-                                     int numOctaves, SkScalar seed,
-                                     const SkISize* tileSize = NULL) {
-        return CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, tileSize);
-    }
-#endif
-
     class PerlinNoiseShaderContext : public SkShader::Context {
     public:
         PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&);
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index 2ca1c5b4fd..2782532ad0 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -35,22 +35,6 @@ public:
                                                   const SkRect& cropRect,
                                                   SkFilterQuality filterQuality);
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkPicture* picture) {
-        return Make(sk_ref_sp(const_cast<SkPicture*>(picture))).release();
-    }
-    static SkImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
-        return Make(sk_ref_sp(const_cast<SkPicture*>(picture)), cropRect).release();
-    }
-    static SkImageFilter* CreateForLocalSpace(const SkPicture* picture,
-                                              const SkRect& cropRect,
-                                              SkFilterQuality filterQuality) {
-        return MakeForLocalSpace(sk_ref_sp(const_cast<SkPicture*>(picture)),
-                                           cropRect,
-                                           filterQuality).release();
-    }
-#endif
-
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureImageFilter)
 
diff --git a/include/effects/SkTableColorFilter.h b/include/effects/SkTableColorFilter.h
index fe31149464..2695f42357 100644
--- a/include/effects/SkTableColorFilter.h
+++ b/include/effects/SkTableColorFilter.h
@@ -36,18 +36,6 @@ public:
                                          const uint8_t tableG[256],
                                          const uint8_t tableB[256]);
 
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* Create(const uint8_t table[256]) {
-        return Make(table).release();
-    }
-    static SkColorFilter* CreateARGB(const uint8_t tableA[256],
-                                     const uint8_t tableR[256],
-                                     const uint8_t tableG[256],
-                                     const uint8_t tableB[256]) {
-        return MakeARGB(tableA, tableR, tableG, tableB).release();
-    }
-#endif
-    
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 };
 
diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h
index ae951e318b..d525fe973d 100644
--- a/include/effects/SkTileImageFilter.h
+++ b/include/effects/SkTileImageFilter.h
@@ -28,12 +28,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkRect& src, const SkRect& dst, SkImageFilter* input) {
-        return Make(src, dst, sk_ref_sp<SkImageFilter>(input)).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer& buffer) const override;
 
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h
index fa9c857a7e..4b42428421 100644
--- a/include/effects/SkXfermodeImageFilter.h
+++ b/include/effects/SkXfermodeImageFilter.h
@@ -49,30 +49,6 @@ public:
 
 #endif
 
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background,
-                                 SkImageFilter* foreground = NULL,
-                                 const SkImageFilter::CropRect* cropRect = NULL) {
-        return Make(sk_ref_sp(mode), 
-                    sk_ref_sp(background),
-                    sk_ref_sp(foreground),
-                    cropRect).release();
-    }
-#endif
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* background,
-                                     SkImageFilter* foreground,
-                                     const SkImageFilter::CropRect* cropRect) {
-        return Make(std::move(mode),
-                    sk_ref_sp(background),
-                    sk_ref_sp(foreground),
-                    cropRect);
-    }
-    static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* background) {
-        return Make(std::move(mode), sk_ref_sp(background));
-    }
-#endif
-
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();
 
 private:
diff --git a/src/core/SkBlurImageFilter.cpp b/src/core/SkBlurImageFilter.cpp
index 78fa071acd..3eacab1511 100644
--- a/src/core/SkBlurImageFilter.cpp
+++ b/src/core/SkBlurImageFilter.cpp
@@ -30,14 +30,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilterImpl)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(SkScalar sigmaX, SkScalar sigmaY, SkImageFilter* input = nullptr,
-                                 const CropRect* cropRect = nullptr) {
-        return SkImageFilter::MakeBlur(sigmaX, sigmaY, sk_ref_sp<SkImageFilter>(input),
-                                     cropRect).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/src/core/SkLocalMatrixImageFilter.h b/src/core/SkLocalMatrixImageFilter.h
index 3ec50384b9..5d69a20f3f 100644
--- a/src/core/SkLocalMatrixImageFilter.h
+++ b/src/core/SkLocalMatrixImageFilter.h
@@ -21,12 +21,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkMatrix& localM, SkImageFilter* input) {
-        return Make(localM, sk_sp<SkImageFilter>(SkSafeRef(input))).release();
-    }
-#endif
-
 protected:
     void flatten(SkWriteBuffer&) const override;
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
diff --git a/src/core/SkMatrixImageFilter.h b/src/core/SkMatrixImageFilter.h
index e02541c12e..f6880877c0 100644
--- a/src/core/SkMatrixImageFilter.h
+++ b/src/core/SkMatrixImageFilter.h
@@ -34,14 +34,6 @@ public:
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixImageFilter)
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
-    static SkImageFilter* Create(const SkMatrix& transform,
-                                 SkFilterQuality filterQuality,
-                                 SkImageFilter* input = nullptr) {
-        return Make(transform, filterQuality, sk_ref_sp<SkImageFilter>(input)).release();
-    }
-#endif
-
 protected:
     SkMatrixImageFilter(const SkMatrix& transform,
                         SkFilterQuality,
diff --git a/src/core/SkModeColorFilter.h b/src/core/SkModeColorFilter.h
index 6222e06fd8..c9d75abcea 100644
--- a/src/core/SkModeColorFilter.h
+++ b/src/core/SkModeColorFilter.h
@@ -17,11 +17,6 @@ public:
     static sk_sp<SkColorFilter> Make(SkColor color, SkXfermode::Mode mode) {
         return sk_sp<SkColorFilter>(new SkModeColorFilter(color, mode));
     }
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-    static SkColorFilter* Create(SkColor color, SkXfermode::Mode mode) {
-        return Make(color, mode).release();
-    }
-#endif
 
     SkColor getColor() const { return fColor; }
     SkXfermode::Mode getMode() const { return fMode; }
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 17843496bb..621179e6b3 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -379,18 +379,6 @@ SET_PTR(Typeface)
 SET_PTR(Rasterizer)
 #endif
 SET_PTR(ImageFilter)
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-SET_PTR(Shader)
-#endif
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
-SET_PTR(ColorFilter)
-#endif
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-SkXfermode* SkPaint::setXfermode(SkXfermode* xfer) {
-    this->setBlendMode(xfer ? xfer->blend() : SkBlendMode::kSrcOver);
-    return this->getXfermode();
-}
-#endif
 #ifdef SK_SUPPORT_LEGACY_PATHEFFECT_PTR
 SET_PTR(PathEffect)
 #endif
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 56011c5784..15d7f4cda4 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -274,30 +274,3 @@ void SkEmptyShader::toString(SkString* str) const {
     str->append(")");
 }
 #endif
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode::Mode mode) {
-    return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), mode).release();
-}
-SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode* xfer) {
-    return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), xfer).release();
-}
-SkShader* SkShader::CreatePictureShader(const SkPicture* src, TileMode tmx, TileMode tmy,
-                                     const SkMatrix* localMatrix, const SkRect* tile) {
-    return MakePictureShader(sk_ref_sp(const_cast<SkPicture*>(src)), tmx, tmy,
-                             localMatrix, tile).release();
-}
-SkShader* SkShader::newWithColorFilter(SkColorFilter* filter) const {
-    return this->makeWithColorFilter(sk_ref_sp(filter)).release();
-}
-#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
diff --git a/src/effects/SkArithmeticModePriv.h b/src/effects/SkArithmeticModePriv.h
index e619274d25..10d5a15721 100644
--- a/src/effects/SkArithmeticModePriv.h
+++ b/src/effects/SkArithmeticModePriv.h
@@ -28,14 +28,6 @@ public:
      */
     static sk_sp<SkXfermode> Make(SkScalar k1, SkScalar k2, SkScalar k3, SkScalar k4,
                                   bool enforcePMColor = true);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    static SkXfermode* Create(SkScalar k1, SkScalar k2,
-                              SkScalar k3, SkScalar k4,
-                              bool enforcePMColor = true) {
-        return Make(k1, k2, k3, k4, enforcePMColor).release();
-    }
-#endif
-
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();
 
 private:
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 6c75619744..09f7ecc4cf 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -116,13 +116,6 @@ sk_sp<SkShader> SkImage::makeShader(SkShader::TileMode tileX, SkShader::TileMode
     return SkImageShader::Make(sk_ref_sp(const_cast<SkImage*>(this)), tileX, tileY, localMatrix);
 }
 
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
-SkShader* SkImage::newShader(SkShader::TileMode tileX, SkShader::TileMode tileY,
-                             const SkMatrix* localMatrix) const {
-    return this->makeShader(tileX, tileY, localMatrix).release();
-}
-#endif
-
 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
     SkBitmap bm;
     if (as_IB(this)->getROPixels(&bm)) {
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index c4a4fb7721..9cd9cfc63c 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -312,10 +312,6 @@ DEF_TEST(Paint_MoreFlattening, r) {
     ASSERT(other.getTextSize()   == paint.getTextSize());
     ASSERT(other.getLooper()     == paint.getLooper());
     ASSERT(other.getBlendMode()  == paint.getBlendMode());
-
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
-    other.setXfermode(nullptr);
-#endif
 }
 
 DEF_TEST(Paint_getHash, r) {