Rename GrGLUniformManager to GrGLProgramResourceManager

src/gpu/effects/GrTextureDomain.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTextureDomainEffect_DEFINED
 #define GrTextureDomainEffect_DEFINED
 
@@ skipping 79 matching lines @@
                            const GrTextureDomain& textureDomain,
                            const char* outColor,
                            const SkString& inCoords,
                            const GrGLEffect::TextureSampler sampler,
                            const char* inModulateColor = NULL);
 
         /**
          * 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 {
             kDomainKeyBits = 2, // See DomainKey().
         };
 
         /**
          * GrGLEffect::GenKey() must call this and include the returned value in it's computed key.
          * The returned will be limited to the lower kDomainKeyBits bits.
          */
         static uint32_t DomainKey(const GrTextureDomain& domain) {
             GR_STATIC_ASSERT(kModeCount <= 4);
             return domain.mode();
         }
 
     private:
         SkDEBUGCODE(Mode                  fMode;)
-        GrGLUniformManager::UniformHandle fDomainUni;
+        GrGLProgramResourceManager::UniformHandle fDomainUni;

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

align

         SkString                          fDomainName;
         GrGLfloat                         fPrevDomain[4];
     };
 
 protected:
     Mode    fMode;
     SkRect  fDomain;
     int     fIndex;
 
     typedef GrSingleTextureEffect INHERITED;
@@ skipping 37 matching lines @@
                           GrCoordSet);
 
     virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
 
     GR_DECLARE_EFFECT_TEST;
 
     typedef GrSingleTextureEffect INHERITED;
 };
 
 #endif