diff options
| author |  Mike Reed <reed@google.com> | 2016-10-20 16:40:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-20 21:08:50 +0000 |
| commit | 958788ab461bf84e8c604a17dba5ebc2d6c27dfa (patch) | |
| tree | d53ea7a59c21c26ea68f3bc830522d8a28f20002 /include/core/SkShader.h | |
| parent | c83ada98e2e60be75ae03e228c4d35eb45357add (diff) | |
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>
Diffstat (limited to 'include/core/SkShader.h')
| -rw-r--r-- | include/core/SkShader.h | 22 |
1 files changed, 0 insertions, 22 deletions
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. * |