Cleanup of shader building system

src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp

Index: src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
index 117497b9ee9f3ebd6cc63b9bb37dd256cbe888bb..66289ed392768d1101ea31dd48579857caa92474 100644
--- a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.cpp
@@ -10,7 +10,7 @@
 #include "GrGLProgramBuilder.h"
 #include "../GrGpuGL.h"
 
-GrGLGeometryShaderBuilder::GrGLGeometryShaderBuilder(GrGLFullProgramBuilder* program)
+GrGLGeometryShaderBuilder::GrGLGeometryShaderBuilder(GrGLProgramBuilder* program)
     : INHERITED(program) {
 
 }
@@ -42,8 +42,8 @@ bool GrGLGeometryShaderBuilder::compileAndAttachShaders(GrGLuint programId,
     SkString geomShaderSrc(GrGetGLSLVersionDecl(fProgramBuilder->ctxInfo()));
     geomShaderSrc.append("layout(triangles) in;\n"
                          "layout(triangle_strip, max_vertices = 6) out;\n");
-    fProgramBuilder->appendDecls(fInputs, &geomShaderSrc);
-    fProgramBuilder->appendDecls(fOutputs, &geomShaderSrc);
+    this->appendDecls(fInputs, &geomShaderSrc);
+    this->appendDecls(fOutputs, &geomShaderSrc);
     geomShaderSrc.append("void main() {\n");
     geomShaderSrc.append("\tfor (int i = 0; i < 3; ++i) {\n"
                          "\t\tgl_Position = gl_in[i].gl_Position;\n");