GrGLProgramStage Renaming Part 3

s/GLProgramStage/GLEffect
minor whitespace/spelling fixup

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6767054

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

2 files changed, 11 insertions, 12 deletions

diff --git a/include/gpu/GrEffect.h b/include/gpu/GrEffect.h
index 7f97e9250d..65034a6ac6 100644
--- a/include/gpu/GrEffect.h
+++ b/include/gpu/GrEffect.h
@@ -42,12 +42,11 @@ public:
         effect guaranteed to produce an opaque output? */
     virtual bool isOpaque(bool inputTextureIsOpaque) const;
 
-    /** This object, besides creating back-end-specific helper
-        objects, is used for run-time-type-identification. The factory should be
-        an instance of templated class, GrTProgramStageFactory. It is templated
-        on the subclass of GrEffect. The subclass must have a nested type
-        (or typedef) named GLProgramStage which will be the subclass of
-        GrGLEffect created by the factory.
+    /** This object, besides creating back-end-specific helper objects, is used for run-time-type-
+        identification. The factory should be an instance of templated class,
+        GrTProgramStageFactory. It is templated on the subclass of GrEffect. The subclass must have
+        a nested type (or typedef) named GLEffect which will be the subclass of GrGLEffect created
+        by the factory.
 
         Example:
         class MyCustomEffect : public GrEffect {
@@ -73,7 +72,7 @@ public:
 
         The default implementation of this function returns true iff
         the two stages have the same return value for numTextures() and
-        for texture() over all valid indicse.
+        for texture() over all valid indices.
      */
     virtual bool isEqual(const GrEffect&) const;
 
diff --git a/include/gpu/GrProgramStageFactory.h b/include/gpu/GrProgramStageFactory.h
index 96505d6c11..b95aa6ae3c 100644
--- a/include/gpu/GrProgramStageFactory.h
+++ b/include/gpu/GrProgramStageFactory.h
@@ -69,7 +69,7 @@ template <typename EffectClass>
 class GrTProgramStageFactory : public GrProgramStageFactory {
 
 public:
-    typedef typename EffectClass::GLProgramStage GLProgramStage;
+    typedef typename EffectClass::GLEffect GLEffect;
 
     /** Returns a human-readable name that is accessible via GrEffect or
         GrGLEffect and is consistent between the two of them.
@@ -83,8 +83,8 @@ public:
         GLSL code generation. */
     virtual StageKey glStageKey(const GrEffect& effect, const GrGLCaps& caps) const SK_OVERRIDE {
         GrAssert(kIllegalEffectClassID != fEffectClassID);
-        StageKey stageID = GLProgramStage::GenKey(effect, caps);
-        StageKey textureKey = GLProgramStage::GenTextureKey(effect, caps);
+        StageKey stageID = GLEffect::GenKey(effect, caps);
+        StageKey textureKey = GLEffect::GenTextureKey(effect, caps);
 #if GR_DEBUG
         static const StageKey kIllegalIDMask = (uint16_t) (~((1U << kProgramStageKeyBits) - 1));
         GrAssert(!(kIllegalIDMask & stageID));
@@ -99,8 +99,8 @@ public:
     /** Returns a new instance of the appropriate *GL* implementation class
         for the given GrEffect; caller is responsible for deleting
         the object. */
-    virtual GLProgramStage* createGLInstance(const GrEffect& effect) const SK_OVERRIDE {
-        return SkNEW_ARGS(GLProgramStage, (*this, effect));
+    virtual GLEffect* createGLInstance(const GrEffect& effect) const SK_OVERRIDE {
+        return SkNEW_ARGS(GLEffect, (*this, effect));
     }
 
     /** This class is a singleton. This function returns the single instance.