Initial refactor of shaderbuilder

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 GrGLProgramDataManager_DEFINED
 #define GrGLProgramDataManager_DEFINED
 
 #include "gl/GrGLShaderVar.h"
 #include "gl/GrGLSL.h"
 #include "GrAllocator.h"
 
 #include "SkTArray.h"
 
 class GrGpuGL;
 class SkMatrix;
 class GrGLProgram;
-class GrGLShaderBuilder;
+class GrGLProgramBuilder;
 
 /** 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:
@@ skipping 13 matching lines @@
         UniformHandle(int value)
             : fValue(value) {
             SkASSERT(isValid());
         }
 
         int toProgramDataIndex() const { SkASSERT(isValid()); return fValue; }
         int toShaderBuilderIndex() const { return toProgramDataIndex(); }
 
         int fValue;
         friend class GrGLProgramDataManager; // For accessing toProgramDataIndex().
-        friend class GrGLShaderBuilder; // For accessing toShaderBuilderIndex().
+        friend class GrGLProgramBuilder; // For accessing toShaderBuilderIndex().
     };
 
-    GrGLProgramDataManager(GrGpuGL*, GrGLProgram*, const GrGLShaderBuilder&);
+    GrGLProgramDataManager(GrGpuGL*, GrGLProgram*, const GrGLProgramBuilder&);
 
     /** 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;
     void set2fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
     void set3f(UniformHandle, GrGLfloat, GrGLfloat, GrGLfloat) const;
@@ skipping 24 matching lines @@
         );
     };
 
     SkTArray<Uniform, true> fUniforms;
     GrGpuGL* fGpu;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif