Incremental refactoring of GrGLProgram and GrGLShaderBuilder

src/gpu/gl/GrGLUniformManager.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
 
 #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 {
+class GrGLUniformManager : 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; }
 
@@ skipping 72 matching lines @@
 
     struct Uniform {
         GrGLint     fVSLocation;
         GrGLint     fFSLocation;
         GrSLType    fType;
         int         fArrayCount;
     };
 
     bool fUsingBindUniform;
     SkTArray<Uniform, true> fUniforms;
     GrGpuGL* fGpu;

[robertphillips, 2014/05/29 12:24:57]

INHERITED ?

[bsalomon, 2014/05/29 21:22:16]

Done.

 };
 
 #endif