Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/effects/gradients/SkGradientShaderPriv.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGradientShaderPriv_DEFINED
 #define SkGradientShaderPriv_DEFINED
 
@@ skipping 271 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Base class for GL gradient effects
 class GrGLGradientEffect : public GrGLEffect {
 public:
     GrGLGradientEffect(const GrBackendEffectFactory& factory);
     virtual ~GrGLGradientEffect();
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRIDE;
 
 protected:
     /**
      * Subclasses must reserve the lower kMatrixKeyBitCnt of their key for use by
      * GrGLGradientEffect.
      */
     enum {
         kMatrixKeyBitCnt = GrGLEffectMatrix::kKeyBits,
         kMatrixKeyMask = (1 << kMatrixKeyBitCnt) - 1,
     };
@@ skipping 13 matching lines @@
      * calling.
      */
     void setupMatrix(GrGLShaderBuilder* builder,
                      EffectKey key,
                      const char** fsCoordName,
                      const char** vsVaryingName = NULL,
                      GrSLType* vsVaryingType = NULL);
 
     // Emits the uniform used as the y-coord to texture samples in derived classes. Subclasses
     // should call this method from their emitCode().
-    void emitYCoordUniform(GrGLShaderBuilder* builder);
+    GrGLShaderBuilder::Uniform* emitYCoordUniform(GrGLShaderBuilder* builder);
 
     // emit code that gets a fragment's color from an expression for t; for now this always uses the
     // texture, but for simpler cases we'll be able to lerp. Subclasses should call this method from
     // their emitCode().
     void emitColorLookup(GrGLShaderBuilder* builder,
+                         GrGLShaderBuilder::Uniform* fsYUni,
                          const char* gradientTValue,
                          const char* outputColor,
                          const char* inputColor,
                          const GrGLShaderBuilder::TextureSampler&);
 
 private:
     static const GrEffect::CoordsType kCoordsType = GrEffect::kLocal_CoordsType;
 
     SkScalar fCachedYCoord;
-    GrGLUniformManager::UniformHandle fFSYUni;
+    GrGLUniform* fFSYUni;
     GrGLEffectMatrix fEffectMatrix;
 
     typedef GrGLEffect INHERITED;
 };
 
 #endif
 
 #endif