Revert[2] of "switch to isABitmap, deprecate SK_SUPPORT_LEGACY_SHADERBITMAPTYPE"

src/core/SkLocalMatrixShader.h

Index: src/core/SkLocalMatrixShader.h
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
index 9c6a526f7b1356511be2373b79c336ff8a6f58f0..a108259461d347cad72e94824e3f577d8615e3a8 100644
--- a/src/core/SkLocalMatrixShader.h
+++ b/src/core/SkLocalMatrixShader.h
@@ -23,11 +23,6 @@ public:
         return fProxyShader->contextSize();
     }
 
-    virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
-                                 TileMode* mode) const override {
-        return fProxyShader->asABitmap(bitmap, matrix, mode);
-    }
-
     GradientType asAGradient(GradientInfo* info) const override {
         return fProxyShader->asAGradient(info);
     }
@@ -58,6 +53,10 @@ protected:
     void flatten(SkWriteBuffer&) const override;
     Context* onCreateContext(const ContextRec&, void*) const override;
 
+    bool onIsABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* mode) const override {
+        return fProxyShader->isABitmap(bitmap, matrix, mode);
+    }
+
 private:
     SkAutoTUnref<SkShader> fProxyShader;