Add ShaderBuilders to EmitArgs and remove gettings from ProgBuilder.

src/gpu/glsl/GrGLSLProgramBuilder.h

Index: src/gpu/glsl/GrGLSLProgramBuilder.h
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h
index 568fe8ae10c04f982519611d23a982447a53aa53..4f3f8a5291a3cfb6c73cb951cda1fc06b3f5ac0c 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.h
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
@@ -165,10 +165,6 @@ public:
         const char* name, GrGLSLVertToFrag*,
         GrSLPrecision fsPrecision = kDefault_GrSLPrecision) = 0;
 
-    // TODO rename getFragmentBuilder
-    virtual GrGLSLFragmentBuilder* getFragmentShaderBuilder() = 0;
-    virtual GrGLSLVertexBuilder* getVertexShaderBuilder() = 0;
-
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
@@ -178,8 +174,6 @@ public:
 /* a specializations for FPs. Lets the user add uniforms and FS code */
 class GrGLSLFPBuilder : public virtual GrGLSLUniformBuilder {
 public:
-    virtual GrGLSLFragmentBuilder* getFragmentShaderBuilder() = 0;
-
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
@@ -188,8 +182,6 @@ public:
 /* a specializations for XPs. Lets the user add uniforms and FS code */
 class GrGLSLXPBuilder : public virtual GrGLSLUniformBuilder {
 public:
-    virtual GrGLSLXPFragmentBuilder* getFragmentShaderBuilder() = 0;
-
     /*
      * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
      */
@@ -201,9 +193,6 @@ class GrGLSLProgramBuilder : public GrGLSLGPBuilder,
 public:
     typedef GrGpu::DrawArgs DrawArgs;
 
-    GrGLSLXPFragmentBuilder* getFragmentShaderBuilder() override { return &fFS; }
-    GrGLSLVertexBuilder* getVertexShaderBuilder() override { return &fVS; }
-
     // Handles for program uniforms (other than per-effect uniforms)
     struct BuiltinUniformHandles {
         UniformHandle       fRTAdjustmentUni;