From bc97c9378bf8b89cc17280a2a04a5c3a9405e6ab Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 13 Nov 2014 13:06:27 -0800 Subject: [PATCH] Remove SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX. This define was added with "Always round text position correctly." 9447103029273a9f8dd7f5997e8af7a1e3ee7488 . The affected clients have been rebaselined and this is no longer defined anywhere. Review URL: https://codereview.chromium.org/722333002 --- src/core/SkDraw.cpp | 4 ---- src/gpu/GrBitmapTextContext.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index b9c39fa8ce..95d348efc5 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1752,14 +1752,10 @@ void SkDraw::drawPosText(const char text[], size_t byteLength, SkFixed fyMask = ~0; if (kX_SkAxisAlignment == baseline) { fyMask = 0; -#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX d1g.fHalfSampleY = SK_FixedHalf; -#endif } else if (kY_SkAxisAlignment == baseline) { fxMask = 0; -#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX d1g.fHalfSampleX = SK_FixedHalf; -#endif } if (SkPaint::kLeft_Align == paint.getTextAlign()) { diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp index a45aeaeb72..03cdf24f6f 100755 --- a/src/gpu/GrBitmapTextContext.cpp +++ b/src/gpu/GrBitmapTextContext.cpp @@ -239,14 +239,10 @@ void GrBitmapTextContext::onDrawPosText(const GrPaint& paint, const SkPaint& skP SkFixed fyMask = ~0; if (kX_SkAxisAlignment == baseline) { fyMask = 0; -#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX halfSampleY = SK_FixedHalf; -#endif } else if (kY_SkAxisAlignment == baseline) { fxMask = 0; -#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX halfSampleX = SK_FixedHalf; -#endif } if (SkPaint::kLeft_Align == fSkPaint.getTextAlign()) {