Move GrGLShaderVar to GrGLSL

src/gpu/glsl/GrGLSLShaderVar.h

Index: src/gpu/glsl/GrGLSLShaderVar.h
diff --git a/src/gpu/gl/GrGLShaderVar.h b/src/gpu/glsl/GrGLSLShaderVar.h
similarity index 93%
rename from src/gpu/gl/GrGLShaderVar.h
rename to src/gpu/glsl/GrGLSLShaderVar.h
index 704763d754a399f588e3ea9d8d9a24e644d1d031..a8b2c9b638cfb2455082375089dafece8fb57e3c 100644
--- a/src/gpu/gl/GrGLShaderVar.h
+++ b/src/gpu/glsl/GrGLSLShaderVar.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrGLShaderVar_DEFINED
-#define GrGLShaderVar_DEFINED
+#ifndef GrGLSLShaderVar_DEFINED
+#define GrGLSLShaderVar_DEFINED
 
 #include "GrShaderVar.h"
 #include "../glsl/GrGLSL.h"
@@ -17,7 +17,7 @@
 /**
  * Represents a variable in a shader
  */
-class GrGLShaderVar : public GrShaderVar {
+class GrGLSLShaderVar : public GrShaderVar {
 public:
     /**
      * See GL_ARB_fragment_coord_conventions.
@@ -30,14 +30,14 @@ public:
     /**
      * Defaults to a float with no precision specifier
      */
-    GrGLShaderVar()
+    GrGLSLShaderVar()
         : GrShaderVar()
         , fOrigin(kDefault_Origin)
         , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
     }
 
-    GrGLShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray,
-                  GrSLPrecision precision = kDefault_GrSLPrecision)
+    GrGLSLShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray,
+                    GrSLPrecision precision = kDefault_GrSLPrecision)
         : GrShaderVar(name, type, arrayCount, precision)
         , fOrigin(kDefault_Origin)
         , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
@@ -46,22 +46,22 @@ public:
         fUseUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS;
     }
 
-    GrGLShaderVar(const char* name, GrSLType type, TypeModifier typeModifier,
-                  int arrayCount = kNonArray, GrSLPrecision precision = kDefault_GrSLPrecision)
+    GrGLSLShaderVar(const char* name, GrSLType type, TypeModifier typeModifier,
+                    int arrayCount = kNonArray, GrSLPrecision precision = kDefault_GrSLPrecision)
         : GrShaderVar(name, type, typeModifier, arrayCount, precision)
         , fOrigin(kDefault_Origin)
         , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != type);
     }
 
-    GrGLShaderVar(const GrShaderVar& var)
+    GrGLSLShaderVar(const GrShaderVar& var)
         : GrShaderVar(var)
         , fOrigin(kDefault_Origin)
         , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != var.getType());
     }
 
-    GrGLShaderVar(const GrGLShaderVar& var)
+    GrGLSLShaderVar(const GrGLSLShaderVar& var)
         : GrShaderVar(var.c_str(), var.getType(), var.getTypeModifier(),
                       var.getArrayCount(), var.getPrecision())
         , fOrigin(var.fOrigin)