commit 9cc1775e7230579ad15345bdcb59fa517c17f870
author joshualitt <joshualitt@chromium.org> Thu Jul 09 06:28:14 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 09 06:28:14 2015 -0700
tree 9e555bccd9ec1161fe61f33d44ae77bba7ef6544
parent 426388eeb7fd5cb9226fb1d2067c04f3aba8d094

rename GrShaderDataManager -> GrProcessorDataManager

BUG=skia:

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

src/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 817206f..2f1d011 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -332,12 +332,12 @@
 class GrDisplacementMapEffect : public GrFragmentProcessor {
 public:
     static GrFragmentProcessor* Create(
-            GrShaderDataManager* shaderDataManager,
+            GrProcessorDataManager* procDataManager,
             SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
             SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, SkVector scale,
             GrTexture* displacement, const SkMatrix& offsetMatrix, GrTexture* color,
             const SkISize& colorDimensions) {
-        return SkNEW_ARGS(GrDisplacementMapEffect, (shaderDataManager,
+        return SkNEW_ARGS(GrDisplacementMapEffect, (procDataManager,
                                                     xChannelSelector,
                                                     yChannelSelector,
                                                     scale,
@@ -372,7 +372,7 @@
 
     void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
-    GrDisplacementMapEffect(GrShaderDataManager*,
+    GrDisplacementMapEffect(GrProcessorDataManager*,
                             SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
                             SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
                             const SkVector& scale,
@@ -449,7 +449,7 @@
                               SkIntToScalar(colorOffset.fY - displacementOffset.fY));
 
     paint.addColorProcessor(
-        GrDisplacementMapEffect::Create(paint.getShaderDataManager(),
+        GrDisplacementMapEffect::Create(paint.getProcessorDataManager(),
                                         fXChannelSelector,
                                         fYChannelSelector,
                                         scale,
@@ -479,7 +479,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 GrDisplacementMapEffect::GrDisplacementMapEffect(
-                             GrShaderDataManager*,
+                             GrProcessorDataManager*,
                              SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
                              SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
                              const SkVector& scale,
@@ -544,7 +544,7 @@
     SkISize colorDimensions;
     colorDimensions.fWidth = d->fRandom->nextRangeU(0, d->fTextures[texIdxColor]->width());
     colorDimensions.fHeight = d->fRandom->nextRangeU(0, d->fTextures[texIdxColor]->height());
-    return GrDisplacementMapEffect::Create(d->fShaderDataManager,
+    return GrDisplacementMapEffect::Create(d->fProcDataManager,
                                            xChannelSelector, yChannelSelector, scale,
                                            d->fTextures[texIdxDispl], SkMatrix::I(),
                                            d->fTextures[texIdxColor], colorDimensions);