| Index: src/gpu/GrFragmentProcessor.cpp
 | 
| diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
 | 
| index 4cf2e73099a2e908425ac5ca45ba0055d5b3ce38..f05b7aa0845aa8781b9065811394d99d1d9e0111 100644
 | 
| --- a/src/gpu/GrFragmentProcessor.cpp
 | 
| +++ b/src/gpu/GrFragmentProcessor.cpp
 | 
| @@ -8,10 +8,12 @@
 | 
|  
 | 
|  #include "GrFragmentProcessor.h"
 | 
|  #include "GrCoordTransform.h"
 | 
| +#include "GrInvariantOutput.h"
 | 
| +#include "GrProcOptInfo.h"
 | 
|  #include "glsl/GrGLSLFragmentProcessor.h"
 | 
|  #include "glsl/GrGLSLFragmentShaderBuilder.h"
 | 
| -#include "glsl/GrGLSLProgramBuilder.h"
 | 
|  #include "glsl/GrGLSLProgramDataManager.h"
 | 
| +#include "glsl/GrGLSLUniformHandler.h"
 | 
|  #include "effects/GrConstColorProcessor.h"
 | 
|  #include "effects/GrXfermodeFragmentProcessor.h"
 | 
|  
 | 
| @@ -226,9 +228,10 @@ const GrFragmentProcessor* GrFragmentProcessor::OverrideInput(const GrFragmentPr
 | 
|                  GLFP() : fHaveSetColor(false) {}
 | 
|                  void emitCode(EmitArgs& args) override {
 | 
|                      const char* colorName;
 | 
| -                    fColorUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
 | 
| -                                                          kVec4f_GrSLType, kDefault_GrSLPrecision,
 | 
| -                                                          "Color", &colorName);
 | 
| +                    fColorUni = args.fUniformHandler->addUniform(
 | 
| +                                                         GrGLSLUniformHandler::kFragment_Visibility,
 | 
| +                                                         kVec4f_GrSLType, kDefault_GrSLPrecision,
 | 
| +                                                         "Color", &colorName);
 | 
|                      this->emitChild(0, colorName, args);
 | 
|                  }
 | 
|  
 | 
| 
 |