Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/effects/SkArithmeticMode.cpp

Index: src/effects/SkArithmeticMode.cpp
diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp
index 43c62ecdfb5736653d5c244fa9298580814073bc..43021841bd1d805e1aa6a679331f498c167f8155 100644
--- a/src/effects/SkArithmeticMode.cpp
+++ b/src/effects/SkArithmeticMode.cpp
@@ -250,12 +250,12 @@ public:
 
     static inline EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRIDE;
 
 private:
     static const GrEffect::CoordsType kCoordsType = GrEffect::kLocal_CoordsType;
     GrGLEffectMatrix fBackgroundEffectMatrix;
-    GrGLUniformManager::UniformHandle fKUni;
+    GrGLUniform* fKUni;
 
     typedef GrGLEffect INHERITED;
 };
@@ -365,9 +365,11 @@ void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder,
     }
 
     GrAssert(NULL != dstColor);
-    fKUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                kVec4f_GrSLType, "k");
-    const char* kUni = builder->getUniformCStr(fKUni);
+    GrGLShaderBuilder::Uniform* KUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kVec4f_GrSLType, "k");
+    fKUni = KUni->glUniform();
+
+    const char* kUni = KUni->c_str();
 
     // We don't try to optimize for this case at all
     if (NULL == inputColor) {
@@ -393,12 +395,12 @@ void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder,
     }
 }
 
-void GrGLArithmeticEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
+void GrGLArithmeticEffect::setData(const GrGLContext& context, const GrDrawEffect& drawEffect) {
     const GrArithmeticEffect& arith = drawEffect.castEffect<GrArithmeticEffect>();
-    uman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
+    fKUni->set4f(context, arith.k1(), arith.k2(), arith.k3(), arith.k4());
     GrTexture* bgTex = arith.backgroundTexture();
     if (bgTex) {
-        fBackgroundEffectMatrix.setData(uman,
+        fBackgroundEffectMatrix.setData(context,
                                         GrEffect::MakeDivByTextureWHMatrix(bgTex),
                                         drawEffect,
                                         bgTex);