commit 2a1848d2aac4450a2bfa63b662ae20439d8c00c3
author Hal Canary <halcanary@google.com> Mon Nov 26 17:23:24 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 27 18:53:32 2018 +0000
tree 403fade90c227d5cd9cc006edeb6713d39d9fa94
parent fc06f981e230fb6486386af2ddec23671bfca94a

SkShaper->SkFont

Change-Id: I6293f08c426650e3d1da8b2f94a81f7b0a65e8a3
Reviewed-on: https://skia-review.googlesource.com/c/172969
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

samplecode/SampleTextBox.cpp

diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp
index 1c698ac..8762391 100644
--- a/samplecode/SampleTextBox.cpp
+++ b/samplecode/SampleTextBox.cpp
@@ -83,7 +83,8 @@
         for (int i = 9; i < 24; i += 2) {
             SkTextBlobBuilder builder;
             paint.setTextSize(SkIntToScalar(i));
-            SkPoint end = shaper.shape(&builder, paint, gText, strlen(gText), true,
+            SkFont font = SkFont::LEGACY_ExtractFromPaint(paint);
+            SkPoint end = shaper.shape(&builder, font, gText, strlen(gText), true,
                                        { margin, margin }, w - margin);
             canvas->drawTextBlob(builder.make(), 0, 0, paint);