Incremental refactoring of GrGLProgram and GrGLShaderBuilder

src/gpu/gl/GrGLProgram.h

Index: src/gpu/gl/GrGLProgram.h
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index a9a2da222e1e656a2d1dd19b0ced081555b2f4f3..4d5ce0f24d949cb63b1e6929b8466e5fc07c638e 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -166,18 +166,8 @@ private:
 
     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().
-     */
-    bool genProgram(GrGLShaderBuilder* builder,
-                    const GrEffectStage* colorStages[],
-                    const GrEffectStage* coverageStages[]);
+                GrGLUniformManager* uman,
+                const GrGLShaderBuilder::GenProgramOutput& builderOutput);
 
     // Sets the texture units for samplers
     void initSamplerUniforms();
@@ -194,25 +184,26 @@ private:
     void setMatrixAndRenderTargetHeight(const GrDrawState&);
 
     // GL program ID
-    GrGLuint                    fProgramID;
+    GrGLuint                            fProgramID;
 
     // these reflect the current values of uniforms (GL uniform values travel with program)
-    MatrixState                       fMatrixState;
-    GrColor                           fColor;
-    GrColor                           fCoverage;
-    int                               fDstCopyTexUnit;
-
-    SkAutoTDelete<GrGLProgramEffects> fColorEffects;
-    SkAutoTDelete<GrGLProgramEffects> fCoverageEffects;
-
-    GrGLProgramDesc                   fDesc;
-    GrGpuGL*                          fGpu;
-
-    GrGLUniformManager                fUniformManager;
-    GrGLShaderBuilder::UniformHandles fUniformHandles;
-
-    bool                              fHasVertexShader;
-    int                               fNumTexCoordSets;
+    MatrixState                         fMatrixState;
+    GrColor                             fColor;
+    GrColor                             fCoverage;
+    int                                 fDstCopyTexUnit;
+
+    SkAutoTDelete<GrGLProgramEffects>   fColorEffects;
+    SkAutoTDelete<GrGLProgramEffects>   fCoverageEffects;
+    
+    GrGLProgramDesc                     fDesc;
+    
+    GrGpuGL*                            fGpu;
+
+    SkAutoTUnref<GrGLUniformManager>    fUniformManager;
+    GrGLShaderBuilder::UniformHandles   fUniformHandles;
+
+    bool                                fHasVertexShader;
+    int                                 fNumTexCoordSets;
 
     typedef SkRefCnt INHERITED;
 };