Disable SkColorShader optimization for Android Framework

bug:22390304

Change-Id: Ibf8cefc82948043d8241b27b2e2dabf4dc6829d5

1 files changed, 6 insertions, 0 deletions

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index c1a03fecaf..9d181196e3 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -272,6 +272,12 @@ void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan16(int x, int y, uint
 // 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;
     }