diff options
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp | 5 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient_gpu.h | 2 | ||||
-rwxr-xr-x | src/gpu/GrDistanceFieldTextContext.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index e98d3baac6..bdf4dd2887 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -49,7 +49,7 @@ protected: // @} private: - + typedef GrGLGradientEffect INHERITED; }; @@ -57,7 +57,7 @@ private: const GrBackendEffectFactory& Gr2PtConicalGradientEffect::getFactory() const { return GrTBackendEffectFactory<Gr2PtConicalGradientEffect>::getInstance(); } - + Gr2PtConicalGradientEffect::Gr2PtConicalGradientEffect(GrContext* ctx, const SkTwoPointConicalGradient& shader, const SkMatrix& matrix, @@ -303,4 +303,3 @@ GrGLEffect::EffectKey GrGL2PtConicalGradientEffect::GenKey(const GrDrawEffect& d return key; } #endif - diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/src/effects/gradients/SkTwoPointConicalGradient_gpu.h index b1b48805d7..8b871e5045 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.h @@ -30,7 +30,7 @@ public: virtual ~Gr2PtConicalGradientEffect() { } static const char* Name() { return "Two-Point Conical Gradient"; } - virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; + virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; // The radial gradient parameters can collapse to a linear (instead of quadratic) equation. bool isDegenerate() const { return SkScalarAbs(fDiffRadius) == SkScalarAbs(fCenterX1); } diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp index cd3922c413..675c146d60 100755 --- a/src/gpu/GrDistanceFieldTextContext.cpp +++ b/src/gpu/GrDistanceFieldTextContext.cpp @@ -328,7 +328,7 @@ inline void GrDistanceFieldTextContext::init(const GrPaint& paint, const SkPaint } fUseLCDText = fSkPaint.isLCDRenderText(); - + fSkPaint.setLCDRenderText(false); fSkPaint.setAutohinted(false); fSkPaint.setSubpixelText(true); |