Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/gpu/gl/GrGLEffectMatrix.cpp

Index: src/gpu/gl/GrGLEffectMatrix.cpp
diff --git a/src/gpu/gl/GrGLEffectMatrix.cpp b/src/gpu/gl/GrGLEffectMatrix.cpp
index 523b37e72ee907d6adcb7c5ff5fc6ca72d059c96..3b465d8cba58585e63613247d7e89e02ef009d82 100644
--- a/src/gpu/gl/GrGLEffectMatrix.cpp
+++ b/src/gpu/gl/GrGLEffectMatrix.cpp
@@ -84,7 +84,7 @@ GrSLType GrGLEffectMatrix::emitCode(GrGLShaderBuilder* builder,
         fUni = builder->addUniform(GrGLShaderBuilder::kVertex_ShaderType,
                                    fUniType,
                                    uniName,
-                                   &uniName);
+                                   &uniName)->glUniform();
     }
 
     const char* varyingName = "MatrixCoord";
@@ -185,12 +185,11 @@ void GrGLEffectMatrix::emitCodeMakeFSCoords2D(GrGLShaderBuilder* builder,
     }
 }
 
-void GrGLEffectMatrix::setData(const GrGLUniformManager& uniformManager,
+void GrGLEffectMatrix::setData(const GrGLContext& context,
                                const SkMatrix& matrix,
                                const GrDrawEffect& drawEffect,
                                const GrTexture* texture) {
-    GrAssert((GrGLUniformManager::kInvalidUniformHandle == fUni) ==
-             (kVoid_GrSLType == fUniType));
+    GrAssert((NULL != fUni) != (kVoid_GrSLType == fUniType));
     const SkMatrix& coordChangeMatrix = GrEffect::kLocal_CoordsType == fCoordsType ?
                                             drawEffect.getCoordChangeMatrix() :
                                             SkMatrix::I();
@@ -207,7 +206,7 @@ void GrGLEffectMatrix::setData(const GrGLUniformManager& uniformManager,
             SkScalar ty = matrix[SkMatrix::kMTransY] + (coordChangeMatrix)[SkMatrix::kMTransY];
             if (fPrevMatrix.get(SkMatrix::kMTransX) != tx ||
                 fPrevMatrix.get(SkMatrix::kMTransY) != ty) {
-                uniformManager.set2f(fUni, tx, ty);
+                fUni->set2f(context, tx, ty);
                 fPrevMatrix.set(SkMatrix::kMTransX, tx);
                 fPrevMatrix.set(SkMatrix::kMTransY, ty);
             }
@@ -227,7 +226,7 @@ void GrGLEffectMatrix::setData(const GrGLUniformManager& uniformManager,
                     combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
             }
             if (!fPrevMatrix.cheapEqualTo(combined)) {
-                uniformManager.setSkMatrix(fUni, combined);
+                fUni->setSkMatrix(context, combined);
                 fPrevMatrix = combined;
             }
             break;