aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-09-28 17:13:38 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-09-28 21:42:04 +0000
commit627778d5ba4fd6f4a4a1238bbf7a1b561469fe21 (patch)
tree25438c2d6f388c4b93c03100c44b20e8fa22f36e /include
parente95ea08cf4134eff0fa1f7afe624b4a49e3c5ba4 (diff)
isABitmap is deprecated, use isAImage
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2748 Change-Id: I7006a3231ff0e9e39b187deae550364bc97f49d6 Reviewed-on: https://skia-review.googlesource.com/2748 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/core/SkShader.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index f7ef836e3e..efd9aa0759 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -229,6 +229,7 @@ public:
*/
size_t contextSize(const ContextRec&) const;
+#ifdef SK_SUPPORT_LEGACY_SHADER_ISABITMAP
/**
* Returns true if this shader is just a bitmap, and if not null, returns the bitmap,
* localMatrix, and tilemodes. If this is not a bitmap, returns false and ignores the
@@ -241,6 +242,7 @@ public:
bool isABitmap() const {
return this->isABitmap(nullptr, nullptr, nullptr);
}
+#endif
/**
* Iff this shader is backed by a single SkImage, return its ptr (the caller must ref this
@@ -522,9 +524,11 @@ protected:
return false;
}
+#ifdef SK_SUPPORT_LEGACY_SHADER_ISABITMAP
virtual bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode[2]) const {
return false;
}
+#endif
virtual SkImage* onIsAImage(SkMatrix*, TileMode[2]) const {
return nullptr;