commit 48c55fe972572c0331ecf6b3d9e8f1a49108bd7e
author Chris Craik <ccraik@google.com> Mon Jul 13 14:14:36 2015 -0700
committer Chris Craik <ccraik@google.com> Tue Jul 14 09:52:27 2015 -0700
tree f7363b946e5e45c7738b850abb4192ea5ad5f33d
parent 6ffafee26a8b5fe61fba0f1ff07d7e96679d5d84

Disable SkColorShader optimization for Android Framework

bug:22390304

Change-Id: Ibf8cefc82948043d8241b27b2e2dabf4dc6829d5

src/core/SkBitmapProcShader.cpp

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index c1a03fe..9d18119 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -272,6 +272,12 @@
 // returns true and set color if the bitmap can be drawn as a single color
 // (for efficiency)
 static bool canUseColorShader(const SkBitmap& bm, SkColor* color) {
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    // Android expects SkShaders constructed from a Bitmap to always be queryable with
+    // SkShader::asABitmap()
+    return false;
+#endif
+
     if (1 != bm.width() || 1 != bm.height()) {
         return false;
     }