fix bookmaker

Illustrations calling SkTextUtils::DrawString must pass font
as well as paint.

[email protected],[email protected]

Docs-Preview: https://skia.org/?cl=181562
Bug: skia:
Change-Id: I907c1c69026d3dc40282545b492a790b2349a8a0
Reviewed-on: https://skia-review.googlesource.com/c/181562
Commit-Queue: Cary Clark <[email protected]>
Reviewed-by: Cary Clark <[email protected]>
Reviewed-by: Joe Gregorio <[email protected]>
Reviewed-by: Mike Reed <[email protected]>

Author: Cary Clark

docs/SkCanvas_Reference.bmh

@@ -4018,10 +4018,8 @@ void draw(SkCanvas* canvas) {
     const char bunny[] = "/(^x^)\\";
     const int len = sizeof(bunny) - 1;
     uint16_t glyphs[len];
-    SkPaint paint;
-    paint.textToGlyphs(bunny, len, glyphs);
-    paint.setTextEncoding(kGlyphID_SkTextEncoding);
     SkFont font;
+    font.textToGlyphs(bunny, len, SkTextEncoding::kUTF8, glyphs, len);
     int runs[] = { 3, 1, 3 };
     SkPoint textPos = { 20, 100 };
     int glyphIndex = 0;
@@ -4030,13 +4028,13 @@ void draw(SkCanvas* canvas) {
         const SkTextBlobBuilder::RunBuffer& run =
                 textBlobBuilder.allocRun(font, runLen, textPos.fX, textPos.fY);
         memcpy(run.glyphs, &glyphs[glyphIndex], sizeof(glyphs[0]) * runLen);
-        paint.setTextSize(1 == runLen ? 20 : 50);
-        textPos.fX += paint.measureText(&glyphs[glyphIndex], sizeof(glyphs[0]) * runLen, nullptr);
+        font.setSize(1 == runLen ? 20 : 50);
+        textPos.fX += font.measureText(&glyphs[glyphIndex], sizeof(glyphs[0]) * runLen,
+                SkTextEncoding::kGlyphID);
         glyphIndex += runLen;
     }
     sk_sp<const SkTextBlob> blob = textBlobBuilder.make();
-    paint.reset();
-    canvas->drawTextBlob(blob.get(), 0, 0, paint);
+    canvas->drawTextBlob(blob.get(), 0, 0, SkPaint());
 }
 ##
 
@@ -4595,8 +4593,8 @@ void draw(SkCanvas* canvas) {
     const char text[] = "Click this link!";
     SkRect bounds;
     SkPaint paint;
-    paint.setTextSize(40);
-    (void)paint.measureText(text, strlen(text), &bounds);
+    SkFont font(nullptr, 40);
+    (void)font.measureText(text, strlen(text), SkTextEncoding::kUTF8, &bounds);
     const char url[] = "https://www.google.com/";
     sk_sp<SkData> urlData(SkData::MakeWithCString(url));
     canvas->drawAnnotation(bounds, "url_key", urlData.get());
@@ -4616,8 +4614,8 @@ void draw(SkCanvas* canvas) {
     const char text[] = "Click this link!";
     SkRect bounds;
     SkPaint paint;
-    paint.setTextSize(40);
-    (void)paint.measureText(text, strlen(text), &bounds);
+    SkFont font(nullptr, 40);
+    (void)font.measureText(text, strlen(text), SkTextEncoding::kUTF8, &bounds);
     const char url[] = "https://www.google.com/";
     sk_sp<SkData> urlData(SkData::MakeWithCString(url));
     canvas->drawAnnotation(bounds, "url_key", urlData.get());