commit 191e64b6c6c2e791ff4d7dae0209a78eed0376f0
author Mike Reed <reed@google.com> Wed Jan 02 15:35:29 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 02 21:02:33 2019 +0000
tree 750c93ad3f05d1a395986106bd7d61634ef6ef0a
parent 35ac038ce0e39abc5cf07d911db97b835121371c

pass a font to GlyphRunBuilder

- avoid using legacy paint->font converter
- call out that drawText exists just for testing
- simplify drawText to assume UTF8

Bug: skia:
Change-Id: Ide14d8581d4744827d2282e7983cc5e19070b21e
Reviewed-on: https://skia-review.googlesource.com/c/180641
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Herb Derby <herb@google.com>

src/gpu/text/GrTextContext.cpp

diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index 2d8d163..01a4a4f 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -226,9 +226,14 @@
 
     SkPaint skPaint;
     skPaint.setColor(random->nextU());
-    skPaint.setLCDRenderText(random->nextBool());
-    skPaint.setAntiAlias(skPaint.isLCDRenderText() ? true : random->nextBool());
-    skPaint.setSubpixelText(random->nextBool());
+
+    SkFont font;
+    if (random->nextBool()) {
+        font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
+    } else {
+        font.setEdging(random->nextBool() ? SkFont::Edging::kAntiAlias : SkFont::Edging::kAlias);
+    }
+    font.setSubpixel(random->nextBool());
 
     const char* text = "The quick brown fox jumps over the lazy dog.";
 
@@ -240,7 +245,7 @@
     int yInt = (random->nextU() % kMaxTrans) * yPos;
 
     return gTextContext->createOp_TestingOnly(context, gTextContext.get(), rtc.get(),
-                                              skPaint, viewMatrix, text, xInt, yInt);
+                                              skPaint, font, viewMatrix, text, xInt, yInt);
 }
 
 #endif