commit d8f904f256b82e48e9a85561eb96e15399b0b2d9
author Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
committer Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
tree 6f418fc8ec95ab0112a39adbd7fa3bfff0d2ca4d
parent 550780745fa28ae9a87d02331841ca5ce4f9c763

Revert "Merge six commits from master-skia to master"

This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989

libs/hwui/SkiaShader.cpp

diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp
index 83652c6..6c105cf 100644
--- a/libs/hwui/SkiaShader.cpp
+++ b/libs/hwui/SkiaShader.cpp
@@ -204,7 +204,7 @@
         SkiaShaderData::BitmapShaderData* outData) {
     SkBitmap bitmap;
     SkShader::TileMode xy[2];
-    if (!shader.isABitmap(&bitmap, nullptr, xy)) {
+    if (shader.asABitmap(&bitmap, nullptr, xy) != SkShader::kDefault_BitmapType) {
         return false;
     }
 
@@ -272,7 +272,7 @@
     }
 
     // The shader is not a gradient. Check for a bitmap shader.
-    if (shader.isABitmap()) {
+    if (shader.asABitmap(nullptr, nullptr, nullptr) == SkShader::kDefault_BitmapType) {
         return kBitmap_SkiaShaderType;
     }
     return kNone_SkiaShaderType;