commit 55d318d35f672e9a4b7e1f2f10ce4e31312f49b6
author fmenozzi <fmenozzi@google.com> Tue Aug 09 08:05:57 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 09 08:05:58 2016 -0700
tree d39a72d3dc5a4d126899bf126ad6863f5ba754c7
parent 0c753e5c268ef88dee3cb5356f58b43a1e58fbf2

Refactor various gradient effect classes

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2221133002

Review-Url: https://codereview.chromium.org/2221133002

src/effects/gradients/SkGradientShader.cpp

diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 52fbe81..710bde8 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -911,12 +911,12 @@
 #include "glsl/GrGLSLUniformHandler.h"
 #include "SkGr.h"
 
-GrGLGradientEffect::GrGLGradientEffect()
+GrGradientEffect::GLSLProcessor::GLSLProcessor()
     : fCachedYCoord(SK_ScalarMax) {
 }
 
-void GrGLGradientEffect::emitUniforms(GrGLSLUniformHandler* uniformHandler,
-                                      const GrGradientEffect& ge) {
+void GrGradientEffect::GLSLProcessor::emitUniforms(GrGLSLUniformHandler* uniformHandler,
+                                                   const GrGradientEffect& ge) {
 
     if (SkGradientShaderBase::kTwo_GpuColorType == ge.getColorType()) { // 2 Color case
         fColorStartUni = uniformHandler->addUniform(kFragment_GrShaderFlag,
@@ -966,8 +966,8 @@
                    a);
 }
 
-void GrGLGradientEffect::onSetData(const GrGLSLProgramDataManager& pdman,
-                                   const GrProcessor& processor) {
+void GrGradientEffect::GLSLProcessor::onSetData(const GrGLSLProgramDataManager& pdman,
+                                                const GrProcessor& processor) {
 
     const GrGradientEffect& e = processor.cast<GrGradientEffect>();
 
@@ -1004,7 +1004,7 @@
 }
 
 
-uint32_t GrGLGradientEffect::GenBaseGradientKey(const GrProcessor& processor) {
+uint32_t GrGradientEffect::GLSLProcessor::GenBaseGradientKey(const GrProcessor& processor) {
     const GrGradientEffect& e = processor.cast<GrGradientEffect>();
 
     uint32_t key = 0;
@@ -1022,14 +1022,14 @@
     return key;
 }
 
-void GrGLGradientEffect::emitColor(GrGLSLFPFragmentBuilder* fragBuilder,
-                                   GrGLSLUniformHandler* uniformHandler,
-                                   const GrGLSLCaps* glslCaps,
-                                   const GrGradientEffect& ge,
-                                   const char* gradientTValue,
-                                   const char* outputColor,
-                                   const char* inputColor,
-                                   const SamplerHandle* texSamplers) {
+void GrGradientEffect::GLSLProcessor::emitColor(GrGLSLFPFragmentBuilder* fragBuilder,
+                                                GrGLSLUniformHandler* uniformHandler,
+                                                const GrGLSLCaps* glslCaps,
+                                                const GrGradientEffect& ge,
+                                                const char* gradientTValue,
+                                                const char* outputColor,
+                                                const char* inputColor,
+                                                const SamplerHandle* texSamplers) {
     if (SkGradientShaderBase::kTwo_GpuColorType == ge.getColorType()){
         fragBuilder->codeAppendf("\tvec4 colorTemp = mix(%s, %s, clamp(%s, 0.0, 1.0));\n",
                                  uniformHandler->getUniformVariable(fColorStartUni).c_str(),