rename GrShaderDataManager -> GrProcessorDataManager

BUG=skia:

Review URL: https://codereview.chromium.org/1228683002

11 files changed, 29 insertions, 25 deletions

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 258a1f8ac3..80c179c435 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -365,7 +365,8 @@ void SkBitmapProcShader::toString(SkString* str) const {
 bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint& paint,
                                              const SkMatrix& viewM,
                                              const SkMatrix* localMatrix, GrColor* paintColor,
-                                             GrShaderDataManager*, GrFragmentProcessor** fp) const {
+                                             GrProcessorDataManager*,
+                                             GrFragmentProcessor** fp) const {
     SkMatrix matrix;
     matrix.setIDiv(fRawBitmap.width(), fRawBitmap.height());
 
@@ -451,7 +452,7 @@ bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint&
 #else
 
 bool SkBitmapProcShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
-                                             const SkMatrix*, GrColor*, GrShaderDataManager*,
+                                             const SkMatrix*, GrColor*, GrProcessorDataManager*,
                                              GrFragmentProcessor**) const {
     SkDEBUGFAIL("Should not call in GPU-less build");
     return false;
diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h
index 6cdde1500b..b76a6fe774 100644
--- a/src/core/SkBitmapProcShader.h
+++ b/src/core/SkBitmapProcShader.h
@@ -32,7 +32,8 @@ public:
 
 
     bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
-                             GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const override;
+                             GrColor*, GrProcessorDataManager*,
+                             GrFragmentProcessor**) const override;
 
     class BitmapProcShaderContext : public SkShader::Context {
     public:
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index a7072324bc..8e01090dd3 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -62,10 +62,10 @@ public:
 #endif
 
 #if SK_SUPPORT_GPU
-    bool asFragmentProcessors(GrContext* context, GrShaderDataManager* shaderDataManager,
+    bool asFragmentProcessors(GrContext* context, GrProcessorDataManager* procDataManager,
                               SkTDArray<GrFragmentProcessor*>* array) const override {
-        bool hasFrags = fInner->asFragmentProcessors(context, shaderDataManager, array);
-        hasFrags |= fOuter->asFragmentProcessors(context, shaderDataManager, array);
+        bool hasFrags = fInner->asFragmentProcessors(context, procDataManager, array);
+        hasFrags |= fOuter->asFragmentProcessors(context, procDataManager, array);
         return hasFrags;
     }
 #endif
diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h
index de3916d877..ee196c09ff 100644
--- a/src/core/SkColorShader.h
+++ b/src/core/SkColorShader.h
@@ -55,7 +55,7 @@ public:
     GradientType asAGradient(GradientInfo* info) const override;
 
     bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
-                             const SkMatrix*, GrColor*, GrShaderDataManager*,
+                             const SkMatrix*, GrColor*, GrProcessorDataManager*,
                              GrFragmentProcessor**) const override;
 
     SK_TO_STRING_OVERRIDE()
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 1586a3fb27..8a3fbb4485 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -276,7 +276,7 @@ bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Cont
     SkMatrix matrix(ctx.ctm());
     matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
     GrPaint paint;
-    if (this->asFragmentProcessor(&fp, paint.getShaderDataManager(), srcTexture, matrix, bounds)) {
+    if (this->asFragmentProcessor(&fp, paint.getProcessorDataManager(), srcTexture, matrix, bounds)) {
         SkASSERT(fp);
         paint.addColorProcessor(fp)->unref();
 
@@ -374,7 +374,7 @@ bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
     return true;
 }
 
-bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*,
+bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*, GrTexture*,
                                         const SkMatrix&, const SkIRect&) const {
     return false;
 }
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
index ddb5de8310..a145432a16 100644
--- a/src/core/SkLocalMatrixShader.h
+++ b/src/core/SkLocalMatrixShader.h
@@ -36,20 +36,20 @@ public:
 
     virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
                                      const SkMatrix& viewM, const SkMatrix* localMatrix,
-                                     GrColor* grColor, GrShaderDataManager* shaderDataManager,
+                                     GrColor* grColor, GrProcessorDataManager* procDataManager,
                                      GrFragmentProcessor** fp) const override {
         SkMatrix tmp = this->getLocalMatrix();
         if (localMatrix) {
             tmp.preConcat(*localMatrix);
         }
         return fProxyShader->asFragmentProcessor(context, paint, viewM, &tmp, grColor,
-                                                 shaderDataManager, fp);
+                                                 procDataManager, fp);
     }
 
 #else
 
     virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
-                                     const SkMatrix*, GrColor*, GrShaderDataManager*,
+                                     const SkMatrix*, GrColor*, GrProcessorDataManager*,
                                      GrFragmentProcessor**) const override {
         SkDEBUGFAIL("Should not call in GPU-less build");
         return false;
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
index 4cf35c7da5..e04e248756 100644
--- a/src/core/SkPictureShader.cpp
+++ b/src/core/SkPictureShader.cpp
@@ -336,7 +336,7 @@ void SkPictureShader::toString(SkString* str) const {
 bool SkPictureShader::asFragmentProcessor(GrContext* context, const SkPaint& paint,
                                           const SkMatrix& viewM, const SkMatrix* localMatrix,
                                           GrColor* paintColor,
-                                          GrShaderDataManager* shaderDataManager,
+                                          GrProcessorDataManager* procDataManager,
                                           GrFragmentProcessor** fp) const {
     int maxTextureSize = 0;
     if (context) {
@@ -347,11 +347,11 @@ bool SkPictureShader::asFragmentProcessor(GrContext* context, const SkPaint& pai
         return false;
     }
     return bitmapShader->asFragmentProcessor(context, paint, viewM, NULL, paintColor,
-                                             shaderDataManager, fp);
+                                             procDataManager, fp);
 }
 #else
 bool SkPictureShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
-                                          const SkMatrix*, GrColor*, GrShaderDataManager*,
+                                          const SkMatrix*, GrColor*, GrProcessorDataManager*,
                                           GrFragmentProcessor**) const {
     SkDEBUGFAIL("Should not call in GPU-less build");
     return false;
diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h
index 4576446cec..31a60fd9e2 100644
--- a/src/core/SkPictureShader.h
+++ b/src/core/SkPictureShader.h
@@ -31,7 +31,8 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader)
 
     bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
-                             GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const override;
+                             GrColor*, GrProcessorDataManager*,
+                             GrFragmentProcessor**) const override;
 
 protected:
     SkPictureShader(SkReadBuffer&);
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index d1f6611727..e5c879eecb 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -215,7 +215,8 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
 }
 
 bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
-                                   GrColor*, GrShaderDataManager*, GrFragmentProcessor**)  const {
+                                   GrColor*, GrProcessorDataManager*,
+                                   GrFragmentProcessor**)  const {
     return false;
 }
 
@@ -346,8 +347,8 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
 #include "SkGr.h"
 
 bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&,
-                                        const SkMatrix*, GrColor* paintColor, GrShaderDataManager*,
-                                        GrFragmentProcessor** fp) const {
+                                        const SkMatrix*, GrColor* paintColor,
+                                        GrProcessorDataManager*, GrFragmentProcessor** fp) const {
     *fp = NULL;
     SkColor skColor = fColor;
     U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha());
@@ -358,7 +359,7 @@ bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const
 #else
 
 bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
-                                        const SkMatrix*, GrColor*, GrShaderDataManager*,
+                                        const SkMatrix*, GrColor*, GrProcessorDataManager*,
                                         GrFragmentProcessor**) const {
     SkDEBUGFAIL("Should not call in GPU-less build");
     return false;
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 3ebd24c981..e0124b9b2f 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -658,7 +658,7 @@ bool SkXfermode::asMode(Mode* mode) const {
     return false;
 }
 
-bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*,
                                      GrTexture*) const {
     return false;
 }
@@ -929,12 +929,12 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
 #include "effects/GrCustomXfermode.h"
 
 bool SkProcCoeffXfermode::asFragmentProcessor(GrFragmentProcessor** fp,
-                                              GrShaderDataManager* shaderDataManager,
+                                              GrProcessorDataManager* procDataManager,
                                               GrTexture* background) const {
     if (GrCustomXfermode::IsSupportedMode(fMode)) {
         if (fp) {
-            SkASSERT(shaderDataManager);
-            *fp = GrCustomXfermode::CreateFP(shaderDataManager, fMode, background);
+            SkASSERT(procDataManager);
+            *fp = GrCustomXfermode::CreateFP(procDataManager, fMode, background);
             SkASSERT(*fp);
         }
         return true;
diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h
index 79e2a1ba4b..bbd274d26d 100644
--- a/src/core/SkXfermode_proccoeff.h
+++ b/src/core/SkXfermode_proccoeff.h
@@ -44,7 +44,7 @@ public:
     bool isOpaque(SkXfermode::SrcColorOpacity opacityType) const override;
 
 #if SK_SUPPORT_GPU
-    bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+    bool asFragmentProcessor(GrFragmentProcessor**, GrProcessorDataManager*,
                              GrTexture* background) const override;
 
     bool asXPFactory(GrXPFactory**) const override;