Revert of switch to isABitmap, deprecate SK_SUPPORT_LEGACY_SHADERBITMAPTYPE

src/core/SkLocalMatrixShader.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLocalMatrixShader_DEFINED
 #define SkLocalMatrixShader_DEFINED
 
 #include "SkShader.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
 class SkLocalMatrixShader : public SkShader {
 public:
     SkLocalMatrixShader(SkShader* proxy, const SkMatrix& localMatrix)
     : INHERITED(&localMatrix)
     , fProxyShader(SkRef(proxy))
     {}
 
     size_t contextSize() const override {
         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);
     }
 
 #if SK_SUPPORT_GPU
     const GrFragmentProcessor* asFragmentProcessor(GrContext* context, const SkMatrix& viewM,
                                         const SkMatrix* localMatrix, SkFilterQuality fq,
                                         GrProcessorDataManager* procDataManager) const override {
         SkMatrix tmp = this->getLocalMatrix();
         if (localMatrix) {
@@ skipping 10 matching lines @@
         return SkRef(fProxyShader.get());
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
 
 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;
 
     typedef SkShader INHERITED;
 };
 
 #endif