aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-06-23 21:33:58 -0400
committerGravatar Mike Reed <reed@google.com>2017-06-24 01:38:38 +0000
commit2e3c955254388927095147e606a1dc2913b80bd1 (patch)
tree4ad229e2d220fa1e76a35ae4d47f012f743a7ead
parent51f6a0f89e55b2c0f102aa7963320a23c586e71d (diff)
disable optimization (for now) for android
Bug: skia: Change-Id: I5e66d6f0a1aede5239b5a51a8b51283cede2be93 Reviewed-on: https://skia-review.googlesource.com/20781 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
-rw-r--r--src/shaders/SkImageShader.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 91665189bc..a19781262c 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -23,7 +23,13 @@
*/
static SkShader::TileMode optimize(SkShader::TileMode tm, int dimension) {
SkASSERT(dimension > 0);
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+ // need to update frameworks/base/libs/hwui/tests/unit/SkiaBehaviorTests.cpp:55 to allow
+ // for transforming to clamp.
+ return tm;
+#else
return dimension == 1 ? SkShader::kClamp_TileMode : tm;
+#endif
}
SkImageShader::SkImageShader(sk_sp<SkImage> img, TileMode tmx, TileMode tmy, const SkMatrix* matrix)