Rename GrGLUniformManager to GrGLProgramResourceManager

src/gpu/gl/GrGLProgramDataManager.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 GrGLUniformManager_DEFINED
-#define GrGLUniformManager_DEFINED
+#ifndef GrGLProgramDataManager_DEFINED
+#define GrGLProgramDataManager_DEFINED
 
 #include "gl/GrGLShaderVar.h"
 #include "gl/GrGLSL.h"
 #include "GrAllocator.h"
 
 #include "SkTArray.h"
 
 class GrGpuGL;
 class SkMatrix;
 
-/** Manages a program's uniforms.
-*/
-class GrGLUniformManager : public SkRefCnt {
+/** Manages the resources used by a shader program.
+ * The resources are objects the program uses to communicate with the
+ * application code.
+ */
+class GrGLProgramDataManager : public SkRefCnt {
 public:
     // Opaque handle to a uniform
     class UniformHandle {
     public:
         static UniformHandle CreateFromUniformIndex(int i);
 
         bool isValid() const { return 0 != fValue; }
 
         bool operator==(const UniformHandle& other) const { return other.fValue == fValue; }
 
         UniformHandle()
             : fValue(0) {
         }
 
     private:
         UniformHandle(int value)
             : fValue(~value) {
             SkASSERT(isValid());
         }
 
         int toUniformIndex() const { SkASSERT(isValid()); return ~fValue; }
 
         int fValue;
-        friend class GrGLUniformManager; // For accessing toUniformIndex().
+        friend class GrGLProgramDataManager; // For accessing toUniformIndex().
     };
 
-    GrGLUniformManager(GrGpuGL* gpu);
+    GrGLProgramDataManager(GrGpuGL* gpu);
 
     UniformHandle appendUniform(GrSLType type, int arrayCount = GrGLShaderVar::kNonArray);
 
     /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
      *  array of uniforms. arrayCount must be <= the array count of the uniform.
      */
     void setSampler(UniformHandle, GrGLint texUnit) const;
     void set1f(UniformHandle, GrGLfloat v0) const;
     void set1fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
     void set2f(UniformHandle, GrGLfloat, GrGLfloat) const;
@@ skipping 29 matching lines @@
     bool isUsingBindUniform() const { return fUsingBindUniform; }
 
     /**
      * Called by the GrGLShaderBuilder to get GL locations for all uniforms.
      */
     void getUniformLocations(GrGLuint programID, const BuilderUniformArray& uniforms);
 
     /**
      * Called by the GrGLShaderBuilder to access the array by the handle (index).
      */
-    const BuilderUniform& getBuilderUniform(const BuilderUniformArray&, GrGLUniformManager::UniformHandle) const;
+    const BuilderUniform& getBuilderUniform(const BuilderUniformArray&, GrGLProgramDataManager::UniformHandle) const;
 
 private:
     enum {
         kUnusedUniform = -1,
     };
 
     struct Uniform {
         GrGLint     fVSLocation;
         GrGLint     fFSLocation;
         GrSLType    fType;
         int         fArrayCount;
     };
 
     bool fUsingBindUniform;
     SkTArray<Uniform, true> fUniforms;
     GrGpuGL* fGpu;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif