From 5a9e2994c9915f76b1e3720f107e87fc952ffab2 Mon Sep 17 00:00:00 2001 From: jvanverth Date: Wed, 17 Jun 2015 13:06:48 -0700 Subject: Revert of Bump up point where we switch to distance fields for large glyphs (patchset #1 id:1 of https://codereview.chromium.org/1184153004/) Reason for revert: Seeing some Nexus 4 perf regressions in individual tests in Chromium that may be due to this change. This doesn't appear to be the correct fix for the bug in any case. Original issue's description: > Bump up point where we switch to distance fields for large glyphs > > This is hopefully a temporary fix. It's unclear why distance fields > are so much slower on the N4 (and N7). > > BUG=chromium:467569 > > Committed: https://skia.googlesource.com/skia/+/0fce1fb02d93e66d42528f322f8aa4ca64ff0fb2 TBR=joshualitt@google.com,bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:467569 Review URL: https://codereview.chromium.org/1178713005 --- src/gpu/GrAtlasTextContext.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp index d1076bbcd0..f2305ad208 100644 --- a/src/gpu/GrAtlasTextContext.cpp +++ b/src/gpu/GrAtlasTextContext.cpp @@ -57,8 +57,6 @@ static const int kMediumDFFontLimit = 72; static const int kLargeDFFontSize = 162; static const int kLargeDFFontLimit = 2 * kLargeDFFontSize; -static const int kLargeGlyphLimit = 192; - SkDEBUGCODE(static const int kExpectedDistanceAdjustTableSize = 8;) static const int kDistanceAdjustLumShift = 5; @@ -453,7 +451,7 @@ inline bool GrAtlasTextContext::canDrawAsDistanceFields(const SkPaint& skPaint, } if (!fEnableDFRendering && !skPaint.isDistanceFieldTextTEMP() && - scaledTextSize < kLargeGlyphLimit) { + scaledTextSize < kLargeDFFontSize) { return false; } -- cgit v1.2.3