4 files changed, 6 insertions, 5 deletions
diff --git a/src/shaders/gradients/Sk4fGradientBase.cpp b/src/shaders/gradients/Sk4fGradientBase.cpp
index 60f8ced4b0..42f30c4a5c 100644
--- a/src/shaders/gradients/Sk4fGradientBase.cpp
+++ b/src/shaders/gradients/Sk4fGradientBase.cpp
@@ -293,7 +293,7 @@ GradientShaderBase4fContext::GradientShaderBase4fContext(const SkGradientShaderB
     const SkMatrix& inverse = this->getTotalInverse();
     fDstToPos.setConcat(shader.fPtsToUnit, inverse);
     SkASSERT(!fDstToPos.hasPerspective());
-    fDstToPosProc = fDstToPos.getMapXYProc();
+    fDstToPosProc = SkMatrixPriv::GetMapXYProc(fDstToPos);
 
     if (shader.fColorsAreOpaque && this->getPaintAlpha() == SK_AlphaOPAQUE) {
         fFlags |= kOpaqueAlpha_Flag;
diff --git a/src/shaders/gradients/Sk4fGradientBase.h b/src/shaders/gradients/Sk4fGradientBase.h
index b2c2b3762c..6361eece0c 100644
--- a/src/shaders/gradients/Sk4fGradientBase.h
+++ b/src/shaders/gradients/Sk4fGradientBase.h
@@ -11,7 +11,7 @@
 #include "Sk4fGradientPriv.h"
 #include "SkColor.h"
 #include "SkGradientShaderPriv.h"
-#include "SkMatrix.h"
+#include "SkMatrixPriv.h"
 #include "SkNx.h"
 #include "SkPM4f.h"
 #include "SkShaderBase.h"
@@ -65,7 +65,7 @@ public:
 protected:
     Sk4fGradientIntervalBuffer fIntervals;
     SkMatrix                   fDstToPos;
-    SkMatrix::MapXYProc        fDstToPosProc;
+    SkMatrixPriv::MapXYProc    fDstToPosProc;
     uint8_t                    fFlags;
     bool                       fColorsArePremul;
     bool                       fDither;
diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp
index 53f25643c6..6dcc0ae479 100644
--- a/src/shaders/gradients/SkGradientShader.cpp
+++ b/src/shaders/gradients/SkGradientShader.cpp
@@ -512,7 +512,7 @@ SkGradientShaderBase::GradientShaderBaseContext::GradientShaderBaseContext(
     fDstToIndex.setConcat(shader.fPtsToUnit, inverse);
     SkASSERT(!fDstToIndex.hasPerspective());
 
-    fDstToIndexProc = fDstToIndex.getMapXYProc();
+    fDstToIndexProc = SkMatrixPriv::GetMapXYProc(fDstToIndex);
 
     // now convert our colors in to PMColors
     unsigned paintAlpha = this->getPaintAlpha();
diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h
index da9098cb5d..23ff30f9d4 100644
--- a/src/shaders/gradients/SkGradientShaderPriv.h
+++ b/src/shaders/gradients/SkGradientShaderPriv.h
@@ -16,6 +16,7 @@
 #include "SkClampRange.h"
 #include "SkColorData.h"
 #include "SkColorSpace.h"
+#include "SkMatrixPriv.h"
 #include "SkOnce.h"
 #include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
@@ -162,7 +163,7 @@ public:
 
     protected:
         SkMatrix    fDstToIndex;
-        SkMatrix::MapXYProc fDstToIndexProc;
+        SkMatrixPriv::MapXYProc fDstToIndexProc;
         uint8_t     fDstToIndexClass;
         uint8_t     fFlags;
         bool        fDither;