Rename GrGLUniformManager to GrGLProgramResourceManager

src/gpu/effects/GrTextureDomain.h

Index: src/gpu/effects/GrTextureDomain.h
diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h
index 80a617ef722eff937f9eb1ef381b97b83768605b..65168800c0d714789547c2b3be76e6bede788d67 100644
--- a/src/gpu/effects/GrTextureDomain.h
+++ b/src/gpu/effects/GrTextureDomain.h
@@ -97,7 +97,7 @@ public:
          * Call this from GrGLEffect::setData() to upload uniforms necessary for the texture domain.
          * The rectangle is automatically adjusted to account for the texture's origin.
          */
-        void setData(const GrGLUniformManager& uman, const GrTextureDomain& textureDomain,
+        void setData(const GrGLProgramResourceManager& prman, const GrTextureDomain& textureDomain,
                      GrSurfaceOrigin textureOrigin);
 
         enum {
@@ -115,7 +115,7 @@ public:
 
     private:
         SkDEBUGCODE(Mode                  fMode;)
-        GrGLUniformManager::UniformHandle fDomainUni;
+        GrGLProgramResourceManager::UniformHandle fDomainUni;

[bsalomon, 2014/07/29 13:08:18]

align

         SkString                          fDomainName;
         GrGLfloat                         fPrevDomain[4];
     };