commit ada68ef2dc986478288a8b8ad867fd3aca431162
author jvanverth <jvanverth@google.com> Mon Nov 03 14:00:24 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Nov 03 14:00:24 2014 -0800
tree ce1075aafba9965c65840f2b76c472f6625b4b1b
parent a6ca5a002ee62a1a6b146111cd9bc3f0c4891122

Improve quality of distance field rendering
- Update spacing of LODs to get better results scaling up to 256
- Remove unnecessary "bolding" from dftext
- Add debug colors for dftext LODs

BUG=skia:2933,skia:2935

Review URL: https://codereview.chromium.org/703463002

src/gpu/GrDistanceFieldTextContext.cpp

diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index 6ffa3c3..5c9019b 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -34,9 +34,9 @@
 
 static const int kSmallDFFontSize = 32;
 static const int kSmallDFFontLimit = 32;
-static const int kMediumDFFontSize = 64;
-static const int kMediumDFFontLimit = 64;
-static const int kLargeDFFontSize = 128;
+static const int kMediumDFFontSize = 78;
+static const int kMediumDFFontLimit = 78;
+static const int kLargeDFFontSize = 192;
 
 namespace {
 // position + texture coord
@@ -153,12 +153,24 @@
     if (scaledTextSize <= kSmallDFFontLimit) {
         fTextRatio = textSize / kSmallDFFontSize;
         fSkPaint.setTextSize(SkIntToScalar(kSmallDFFontSize));
+#if DEBUG_TEXT_SIZE
+        fSkPaint.setColor(SkColorSetARGB(0xFF, 0x00, 0x00, 0xFF));
+        fPaint.setColor(GrColorPackRGBA(0x00, 0x00, 0xFF, 0xFF));
+#endif
     } else if (scaledTextSize <= kMediumDFFontLimit) {
         fTextRatio = textSize / kMediumDFFontSize;
         fSkPaint.setTextSize(SkIntToScalar(kMediumDFFontSize));
+#if DEBUG_TEXT_SIZE
+        fSkPaint.setColor(SkColorSetARGB(0xFF, 0x00, 0xFF, 0x00));
+        fPaint.setColor(GrColorPackRGBA(0x00, 0xFF, 0x00, 0xFF));
+#endif
     } else {
         fTextRatio = textSize / kLargeDFFontSize;
         fSkPaint.setTextSize(SkIntToScalar(kLargeDFFontSize));
+#if DEBUG_TEXT_SIZE
+        fSkPaint.setColor(SkColorSetARGB(0xFF, 0xFF, 0x00, 0x00));
+        fPaint.setColor(GrColorPackRGBA(0xFF, 0x00, 0x00, 0xFF));
+#endif
     }
 
     fUseLCDText = fSkPaint.isLCDRenderText();