Revert of hide get/setLocalMatrix

include/core/SkShader.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkShader_DEFINED
 #define SkShader_DEFINED
@@ skipping 20 matching lines @@
  *  to be modified.
  */
 class SK_API SkShader : public SkFlattenable {
 public:
     SK_DECLARE_INST_COUNT(SkShader)
 
     SkShader(const SkMatrix* localMatrix = NULL);
     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.
      *  @param localM   The shader's new local matrix.
      */
     void setLocalMatrix(const SkMatrix& localM) { fLocalMatrix = localM; }
 
     /**
      *  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
          *  original bounds
          */
         kClamp_TileMode,
 
         /** repeat the shader's image horizontally and vertically */
         kRepeat_TileMode,
 
@@ skipping 363 matching lines @@
      */
     virtual Context* onCreateContext(const ContextRec&, void* storage) const;
 
 private:
     SkMatrix fLocalMatrix;
 
     typedef SkFlattenable INHERITED;
 };
 
 #endif