| Index: src/gpu/gl/GrGLProgramDataManager.h | 
| diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/gl/GrGLProgramDataManager.h | 
| index c2cb8fc69894f8ff8d8d8934a791242fd9121832..b3b5715da10dd5cdf467decc4298419ecb7e5475 100644 | 
| --- a/src/gpu/gl/GrGLProgramDataManager.h | 
| +++ b/src/gpu/gl/GrGLProgramDataManager.h | 
| @@ -46,11 +46,12 @@ public: | 
| GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray&, | 
| const VaryingInfoArray&); | 
|  | 
| -    /** Functions for uploading uniform values. The varities ending in v can be used to upload to an | 
| -     *  array of uniforms. arrayCount must be <= the array count of the uniform. | 
| -     */ | 
| -    void setSampler(UniformHandle, int texUnit) const; | 
|  | 
| +    void setSamplers(const SkTArray<GrGLSampler>& samplers) const; | 
| + | 
| +    /** Functions for uploading uniform values. The varities ending in v can be used to upload to an | 
| +    *  array of uniforms. arrayCount must be <= the array count of the uniform. | 
| +    */ | 
| void set1f(UniformHandle, float v0) const override; | 
| void set1fv(UniformHandle, int arrayCount, const float v[]) const override; | 
| void set2f(UniformHandle, float, float) const override; | 
|  |