From 08da4f22d790cfc51bbeb10b4b84dab49cf0eaec Mon Sep 17 00:00:00 2001 From: joshualitt Date: Tue, 16 Sep 2014 07:17:28 -0700 Subject: Revert of removing GrDrawEffect (patchset #4 id:60001 of https://codereview.chromium.org/571163002/) Reason for revert: reverting to unblock another revert Original issue's description: > removing GrDrawEffect > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e R=bsalomon@google.com TBR=bsalomon@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: joshualitt@chromium.org Review URL: https://codereview.chromium.org/577593003 --- src/effects/gradients/SkLinearGradient.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/effects/gradients/SkLinearGradient.cpp') diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index d978e5ada0..b26d60626b 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -468,21 +468,21 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y, class GrGLLinearGradient : public GrGLGradientEffect { public: - GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrEffect&) + GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrDrawEffect&) : INHERITED (factory) { } virtual ~GrGLLinearGradient() { } virtual void emitCode(GrGLProgramBuilder*, - const GrEffect&, + const GrDrawEffect&, const GrEffectKey&, const char* outputColor, const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - static void GenKey(const GrEffect& effect, const GrGLCaps&, GrEffectKeyBuilder* b) { - b->add32(GenBaseGradientKey(effect)); + static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) { + b->add32(GenBaseGradientKey(drawEffect)); } private: @@ -551,7 +551,7 @@ GrEffect* GrLinearGradient::TestCreate(SkRandom* random, ///////////////////////////////////////////////////////////////////// void GrGLLinearGradient::emitCode(GrGLProgramBuilder* builder, - const GrEffect&, + const GrDrawEffect&, const GrEffectKey& key, const char* outputColor, const char* inputColor, -- cgit v1.2.3