diff options
| author |  Ben Wagner <bungeman@google.com> | 2016-11-02 16:41:42 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-02 21:20:43 +0000 |
| commit | d5def99232f0c66de8da213fff09fa4bcaa9df4d (patch) | |
| tree | 927361759c05554e018f3ee136276cdb506ab189 | |
| parent | eac8225c76a8184402ed2fac6b4749ebec94273f (diff) | |
Remove SK_SUPPORT_LEGACY_SHADER_ASALOCALMATRIXSHADER
This is no longer used and can be removed.
Change-Id: I6aab1cf243aa1f09bdcd26517a392bbcf11c9444
Reviewed-on: https://skia-review.googlesource.com/4360
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
| -rw-r--r-- | gn/android_framework_defines.gni | 1 | ||||
| -rw-r--r-- | include/core/SkShader.h | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index 7422382e75..120005858d 100644 --- a/gn/android_framework_defines.gni +++ b/gn/android_framework_defines.gni @@ -15,6 +15,5 @@ android_framework_defines = [ "SK_SUPPORT_LEGACY_CLIP_REGIONOPS", "SK_SUPPORT_LEGACY_SHADER_ISABITMAP", "SK_SUPPORT_LEGACY_COLOR_SPACE_FACTORIES", - "SK_SUPPORT_LEGACY_SHADER_ASALOCALMATRIXSHADER", "SK_SUPPORT_LEGACY_SETIMAGEFILTER_PTR", ] diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 6c4ee0a15b..d9518b122b 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -480,18 +480,6 @@ public: static sk_sp<SkShader> MakePictureShader(sk_sp<SkPicture> src, TileMode tmx, TileMode tmy, const SkMatrix* localMatrix, const SkRect* tile); -#ifdef SK_SUPPORT_LEGACY_SHADER_ASALOCALMATRIXSHADER - /** - * If this shader can be represented by another shader + a localMatrix, return that shader - * and, if not NULL, the localMatrix. If not, return NULL and ignore the localMatrix parameter. - * - * Note: the returned shader (if not NULL) will have been ref'd, and it is the responsibility - * of the caller to balance that with unref() when they are done. - */ - SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const { - return this->makeAsALocalMatrixShader(localMatrix).release(); - } -#endif /** * If this shader can be represented by another shader + a localMatrix, return that shader and * the localMatrix. If not, return nullptr and ignore the localMatrix parameter. |