Move all code generation from GrGLProgram to GrGLShaderBuilder

src/gpu/gl/GrGLProgram.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLProgram_DEFINED
 #define GrGLProgram_DEFINED
@@ skipping 146 matching lines @@
      */
     void setData(GrDrawState::BlendOptFlags,
                  const GrEffectStage* colorStages[],
                  const GrEffectStage* coverageStages[],
                  const GrDeviceCoordTexture* dstCopy, // can be NULL
                  SharedGLState*);
 
 private:
     typedef GrGLUniformManager::UniformHandle UniformHandle;
 
-    // handles for uniforms (aside from per-effect samplers)
-    struct UniformHandles {
-        UniformHandle       fViewMatrixUni;
-        UniformHandle       fRTAdjustmentUni;
-        UniformHandle       fColorUni;
-        UniformHandle       fCoverageUni;
-
-        // We use the render target height to provide a y-down frag coord when specifying
-        // origin_upper_left is not supported.
-        UniformHandle       fRTHeightUni;
-
-        // Uniforms for computing texture coords to do the dst-copy lookup
-        UniformHandle       fDstCopyTopLeftUni;
-        UniformHandle       fDstCopyScaleUni;
-        UniformHandle       fDstCopySamplerUni;
-    };
-
     GrGLProgram(GrGpuGL* gpu,
                 const GrGLProgramDesc& desc,
                 const GrEffectStage* colorStages[],
                 const GrEffectStage* coverageStages[]);
 
     bool succeeded() const { return 0 != fProgramID; }
 
     /**
      * This is the heavy initialization routine for building a GLProgram. colorStages and
      * coverageStages correspond to the output of GrGLProgramDesc::Build().
@@ skipping 25 matching lines @@
     GrColor                           fCoverage;
     int                               fDstCopyTexUnit;
 
     SkAutoTDelete<GrGLProgramEffects> fColorEffects;
     SkAutoTDelete<GrGLProgramEffects> fCoverageEffects;
 
     GrGLProgramDesc                   fDesc;
     GrGpuGL*                          fGpu;
 
     GrGLUniformManager                fUniformManager;
-    UniformHandles                    fUniformHandles;
+    GrGLShaderBuilder::UniformHandles fUniformHandles;
 
     bool                              fHasVertexShader;
     int                               fNumTexCoordSets;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif