Revert of hide get/setLocalMatrix

include/core/SkShader.h

Index: include/core/SkShader.h
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 87e10ceb2faba6dabdeeec3e93d498480ad0c9c8..2f3764c0be032d9e566393fadebeda59bd1c3078 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -38,15 +38,14 @@
     virtual ~SkShader();
 
     /**
+     *  Returns true if the local matrix is not an identity matrix.
+     */
+    bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); }
+
+    /**
      *  Returns the local matrix.
      */
     const SkMatrix& getLocalMatrix() const { return fLocalMatrix; }
-
-#ifdef SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX
-    /**
-     *  Returns true if the local matrix is not an identity matrix.
-     */
-    bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); }
 
     /**
      *  Set the shader's local matrix.
@@ -58,7 +57,6 @@
      *  Reset the shader's local matrix to identity.
      */
     void resetLocalMatrix() { fLocalMatrix.reset(); }
-#endif
 
     enum TileMode {
         /** replicate the edge color if the shader draws outside of its