commit 4484b8f1e348d2b949d74223acc196b2389dc7b5
author Hal Canary <halcanary@google.com> Tue Jan 08 14:00:08 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 09 16:06:13 2019 +0000
tree fea2b867095ca8fa92c77d954dc5f241106be516
parent df2d27e0c7d94f13b7bfacdfb0a8263ceb644f66

drawText Cleanup, part 4

Change-Id: I2b48b6f507fe567cf44836c8755871c2a2f61ec0
Reviewed-on: https://skia-review.googlesource.com/c/182220
Auto-Submit: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>

samplecode/SampleSubpixelTranslate.cpp

diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp
index d394127..16efda2 100644
--- a/samplecode/SampleSubpixelTranslate.cpp
+++ b/samplecode/SampleSubpixelTranslate.cpp
@@ -5,12 +5,14 @@
  * found in the LICENSE file.
  */
 
+#include "Sample.h"
+
 #include "DecodeFile.h"
 #include "Resources.h"
-#include "Sample.h"
 #include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
+#include "SkFont.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 
@@ -58,8 +60,8 @@
         };
 
         SkPaint paint;
-        paint.setTextSize(48);
-        paint.setSubpixelText(true);
+        SkFont font(nullptr, 48);
+        font.setSubpixel(true);
 
         paint.setAntiAlias(true);
         for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
@@ -68,31 +70,39 @@
             canvas->drawBitmapRect( fBM, r, &paint );
         }
 
-        canvas->drawString( "AA Scaled", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize/2, paint );
+        canvas->drawString("AA Scaled", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10),
+                           fCurPos.fY + fSize/2, font, paint);
 
         paint.setAntiAlias(false);
+        font.setEdging(SkFont::Edging::kAlias);
         for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
             paint.setFilterQuality(gQualitys[i]);
             SkRect r = SkRect::MakeXYWH( fCurPos.fX + i * (fSize + 10), fCurPos.fY + fSize + 10, fSize, fSize );
             canvas->drawBitmapRect( fBM, r, &paint );
         }
-        canvas->drawString( "Scaled", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10), fCurPos.fY + fSize + 10 + fSize/2, paint );
+        canvas->drawString("Scaled", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fSize + 10),
+                           fCurPos.fY + fSize + 10 + fSize/2, font, paint);
 
         paint.setAntiAlias(true);
+        font.setEdging(SkFont::Edging::kAntiAlias);
         for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
             paint.setFilterQuality(gQualitys[i]);
             canvas->drawBitmap( fBM, fCurPos.fX + i * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10), &paint );
         }
 
-        canvas->drawString( "AA No Scale", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fSize/2, paint );
+        canvas->drawString("AA No Scale",
+                           fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10),
+                           fCurPos.fY + 2*(fSize + 10) + fSize/2, font, paint);
 
         paint.setAntiAlias(false);
+        font.setEdging(SkFont::Edging::kAlias);
         for (size_t i = 0; i < SK_ARRAY_COUNT(gQualitys); ++i) {
             paint.setFilterQuality(gQualitys[i]);
             canvas->drawBitmap( fBM, fCurPos.fX + i * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10, &paint );
         }
 
-        canvas->drawString( "No Scale", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10), fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10 + fSize/2, paint );
+        canvas->drawString("No Scale", fCurPos.fX + SK_ARRAY_COUNT(gQualitys) * (fBM.width() + 10),
+                           fCurPos.fY + 2*(fSize + 10) + fBM.height() + 10 + fSize/2, font, paint);
 
 
         fCurPos.fX += fHorizontalVelocity;