More non-invertible shader local matrix guards

Change-Id: Ida9a300420ff1d883e617cdaadb80e88c99ad226
Reviewed-on: https://skia-review.googlesource.com/8333
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 4c264e4741..323d29df4b 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -39,7 +39,6 @@ class GrFragmentProcessor;
  */
 class SK_API SkShader : public SkFlattenable {
 public:
-    SkShader(const SkMatrix* localMatrix = NULL);
     virtual ~SkShader();
 
     /**
@@ -467,6 +466,8 @@ public:
                       const SkMatrix& ctm, const SkPaint&) const;
 
 protected:
+    SkShader(const SkMatrix* localMatrix = nullptr);
+
     void flatten(SkWriteBuffer&) const override;
 
     bool computeTotalInverse(const ContextRec&, SkMatrix* totalInverse) const;
@@ -498,9 +499,7 @@ protected:
                                 const SkMatrix* /*local matrix*/) const;
 
 private:
-    // This is essentially const, but not officially so it can be modified in
-    // constructors.
-    SkMatrix fLocalMatrix;
+    const SkMatrix fLocalMatrix;
 
     // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer constructor.
     friend class SkLocalMatrixShader;