Move GrGLShaderVar to GrGLSL

src/gpu/gl/builders/GrGLProgramBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramBuilder_DEFINED
 #define GrGLProgramBuilder_DEFINED
 
@@ skipping 49 matching lines @@
     }
 
     virtual UniformHandle addUniformArray(
         uint32_t visibility,
         GrSLType type,
         GrSLPrecision precision,
         const char* name,
         int arrayCount,
         const char** outName = nullptr) = 0;
 
-    virtual const GrGLShaderVar& getUniformVariable(UniformHandle u) const = 0;
+    virtual const GrGLSLShaderVar& getUniformVariable(UniformHandle u) const = 0;
 
     /**
      * Shortcut for getUniformVariable(u).c_str()
      */
     virtual const char* getUniformCStr(UniformHandle u) const = 0;
 
     virtual const GrGLContextInfo& ctxInfo() const = 0;
 
     virtual const GrGLSLCaps* glslCaps() const = 0;
 
@@ skipping 155 matching lines @@
      */
     static GrGLProgram* CreateProgram(const DrawArgs&, GrGLGpu*);
 
     UniformHandle addUniformArray(uint32_t visibility,
                                   GrSLType type,
                                   GrSLPrecision precision,
                                   const char* name,
                                   int arrayCount,
                                   const char** outName) override;
 
-    const GrGLShaderVar& getUniformVariable(UniformHandle u) const override {
+    const GrGLSLShaderVar& getUniformVariable(UniformHandle u) const override {
         return fUniforms[u.toIndex()].fVariable;
     }
 
     const char* getUniformCStr(UniformHandle u) const override {
         return this->getUniformVariable(u).c_str();
     }
 
     const GrGLContextInfo& ctxInfo() const override;
 
     const GrGLSLCaps* glslCaps() const override;
@@ skipping 147 matching lines @@
     GrGLPrimitiveProcessor::TransformsOut fOutCoords;
     SkTArray<UniformHandle> fSamplerUniforms;
     SeparableVaryingInfoArray fSeparableVaryingInfos;
 
     friend class GrGLShaderBuilder;
     friend class GrGLVertexBuilder;
     friend class GrGLFragmentShaderBuilder;
     friend class GrGLGeometryBuilder;
 };
 #endif