GrCustomStage Renaming Part 4

Rename a bunch of things found by searching for "custom".
Review URL: https://codereview.appspot.com/6765048

git-svn-id: http://skia.googlecode.com/svn/trunk@6085 2bbb7eff-a529-9590-31e7-b0007b416f81

8 files changed, 14 insertions, 14 deletions

diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index d470672a3f..b54d5f5d21 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -118,7 +118,7 @@ public:
     /** A subclass may implement this factory function to work with the GPU backend. If the return
         is non-NULL then the caller owns a ref on the returned object.
      */
-    virtual GrEffect* asNewCustomStage(GrContext*) const;
+    virtual GrEffect* asNewEffect(GrContext*) const;
 
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 protected:
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index f37d5a39fa..4c7501979f 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -90,12 +90,12 @@ public:
      *  in it.  The caller assumes ownership of the stage, and it is up to the
      *  caller to unref it.
      */
-    virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const;
+    virtual bool asNewEffect(GrEffect** stage, GrTexture*) const;
 
     /**
      *  Returns true if the filter can be processed on the GPU.  This is most
      *  often used for multi-pass effects, where intermediate results must be
-     *  rendered to textures.  For single-pass effects, use asNewCustomStage().
+     *  rendered to textures.  For single-pass effects, use asNewEffect().
      *  The default implementation returns false.
      */
     virtual bool canFilterImageGPU() const;
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 23e095029b..7329c1bf4c 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -307,12 +307,12 @@ public:
 
     /**
      *  If the shader subclass has a GrEffect implementation, this installs
-     *  a custom stage on the sampler. A GrContext pointer is required since custom
+     *  an effect on the sampler. A GrContext pointer is required since custom
      *  stages may need to create textures. The sampler parameter is necessary to set a
      *  texture matrix. It will eventually be removed and this function will operate as a
      *  GrEffect factory.
      */
-    virtual bool asNewCustomStage(GrContext* context, GrSamplerState* sampler) const;
+    virtual bool asNewEffect(GrContext* context, GrSamplerState* sampler) const;
 
     //////////////////////////////////////////////////////////////////////////
     //  Factory methods for stock shaders
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index 3ab253ab2b..799cf8c16d 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -22,7 +22,7 @@ public:
     virtual uint32_t getFlags() SK_OVERRIDE;
     virtual bool asColorMatrix(SkScalar matrix[20]) SK_OVERRIDE;
 #if SK_SUPPORT_GPU
-    virtual GrEffect* asNewCustomStage(GrContext*) const SK_OVERRIDE;
+    virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE;
 #endif
 
     struct State {
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h
index 26cb1a88bb..21ab894663 100644
--- a/include/effects/SkMagnifierImageFilter.h
+++ b/include/effects/SkMagnifierImageFilter.h
@@ -16,8 +16,8 @@ class SK_API SkMagnifierImageFilter : public SkImageFilter {
 public:
     SkMagnifierImageFilter(SkRect srcRect, SkScalar inset);
 
-    virtual bool asNewCustomStage(GrEffect** stage,
-                                  GrTexture* texture) const SK_OVERRIDE;
+    virtual bool asNewEffect(GrEffect** stage,
+                             GrTexture* texture) const SK_OVERRIDE;
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter)
 
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h
index bdeaad3048..c0a5fd72a3 100644
--- a/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/include/effects/SkMatrixConvolutionImageFilter.h
@@ -62,7 +62,7 @@ protected:
                                SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
 
 #if SK_SUPPORT_GPU
-    virtual bool asNewCustomStage(GrEffect** stage, GrTexture*) const SK_OVERRIDE;
+    virtual bool asNewEffect(GrEffect** stage, GrTexture*) const SK_OVERRIDE;
 #endif
 
 private:
diff --git a/include/gpu/GrEffect.h b/include/gpu/GrEffect.h
index c5af2b9b56..7574958f46 100644
--- a/include/gpu/GrEffect.h
+++ b/include/gpu/GrEffect.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrCustomStage_DEFINED
-#define GrCustomStage_DEFINED
+#ifndef GrEffect_DEFINED
+#define GrEffect_DEFINED
 
 #include "GrRefCnt.h"
 #include "GrNoncopyable.h"
@@ -50,11 +50,11 @@ public:
         GrGLProgramStage created by the factory.
 
         Example:
-        class MyCustomStage : public GrEffect {
+        class MyCustomEffect : public GrEffect {
         ...
             virtual const GrProgramStageFactory& getFactory() const
                                                             SK_OVERRIDE {
-                return GrTProgramStageFactory<MyCustomStage>::getInstance();
+                return GrTProgramStageFactory<MyCustomEffect>::getInstance();
             }
         ...
         };
diff --git a/include/gpu/GrProgramStageFactory.h b/include/gpu/GrProgramStageFactory.h
index 385ebfe43a..1a4f07814a 100644
--- a/include/gpu/GrProgramStageFactory.h
+++ b/include/gpu/GrProgramStageFactory.h
@@ -80,7 +80,7 @@ public:
 
     /** Returns a value that idenitifes the GLSL shader code generated by
         a GrEffect. This enables caching of generated shaders. Part of the
-        id identifies the GrCustomShader subclass. The remainder is based
+        id identifies the GrEffect subclass. The remainder is based
         on the aspects of the GrEffect object's configuration that affect
         GLSL code generation. */
     virtual StageKey glStageKey(const GrEffect& stage,