From 1c23557b6eaa2d1f81bca23b318adb5555dd60bd Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 6 Dec 2018 12:57:29 -0500 Subject: [PATCH] bookmaker nightly fix replace SkPaint::kGlyphID_TextEncoding with kGlyphID_SkTextEncoding NOTRY=true TBR=reed@google.com Docs-Preview: https://skia.org/?cl=175340 Bug: skia: Change-Id: I5835bf2d45969b727d9c895d34d7adb7c15b251c Reviewed-on: https://skia-review.googlesource.com/c/175340 Commit-Queue: Cary Clark Auto-Submit: Cary Clark Reviewed-by: Cary Clark --- docs/SkTextBlobBuilder_Reference.bmh | 2 +- site/user/api/SkTextBlobBuilder_Reference.md | 2 +- site/user/api/catalog.htm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/SkTextBlobBuilder_Reference.bmh b/docs/SkTextBlobBuilder_Reference.bmh index cb5ceb5286..489142eb2c 100644 --- a/docs/SkTextBlobBuilder_Reference.bmh +++ b/docs/SkTextBlobBuilder_Reference.bmh @@ -105,7 +105,7 @@ blob equals nullptr sk_sp blob = builder.make(); SkDebugf("blob " "%s" " nullptr\n", blob == nullptr ? "equals" : "does not equal"); SkPaint paint; - paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); + paint.setTextEncoding(kGlyphID_SkTextEncoding); SkFont font; paint.textToGlyphs("x", 1, builder.allocRun(font, 1, 20, 20).glyphs); blob = builder.make(); diff --git a/site/user/api/SkTextBlobBuilder_Reference.md b/site/user/api/SkTextBlobBuilder_Reference.md index 479d316e3d..e628275f21 100644 --- a/site/user/api/SkTextBlobBuilder_Reference.md +++ b/site/user/api/SkTextBlobBuilder_Reference.md @@ -151,7 +151,7 @@ reused to build a new set of runs. ### Example -
+
#### Example Output diff --git a/site/user/api/catalog.htm b/site/user/api/catalog.htm index 2c2bb5352d..2c2431be42 100644 --- a/site/user/api/catalog.htm +++ b/site/user/api/catalog.htm @@ -3564,8 +3564,8 @@ "stdout": "blob equals nullptr" }, "SkTextBlobBuilder_make": { - "code": "void draw(SkCanvas* canvas) {\n SkTextBlobBuilder builder;\n sk_sp blob = builder.make();\n SkDebugf(\"blob \" \"%s\" \" nullptr\\n\", blob == nullptr ? \"equals\" : \"does not equal\");\n SkPaint paint;\n paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);\n SkFont font;\n paint.textToGlyphs(\"x\", 1, builder.allocRun(font, 1, 20, 20).glyphs);\n blob = builder.make();\n SkDebugf(\"blob \" \"%s\" \" nullptr\\n\", blob == nullptr ? \"equals\" : \"does not equal\");\n blob = builder.make();\n SkDebugf(\"blob \" \"%s\" \" nullptr\\n\", blob == nullptr ? \"equals\" : \"does not equal\");\n}", - "hash": "a6b09a31f2877ba813c6a4e9e3fef1fa", + "code": "void draw(SkCanvas* canvas) {\n SkTextBlobBuilder builder;\n sk_sp blob = builder.make();\n SkDebugf(\"blob \" \"%s\" \" nullptr\\n\", blob == nullptr ? \"equals\" : \"does not equal\");\n SkPaint paint;\n paint.setTextEncoding(kGlyphID_SkTextEncoding);\n SkFont font;\n paint.textToGlyphs(\"x\", 1, builder.allocRun(font, 1, 20, 20).glyphs);\n blob = builder.make();\n SkDebugf(\"blob \" \"%s\" \" nullptr\\n\", blob == nullptr ? \"equals\" : \"does not equal\");\n blob = builder.make();\n SkDebugf(\"blob \" \"%s\" \" nullptr\\n\", blob == nullptr ? \"equals\" : \"does not equal\");\n}", + "hash": "34c37c0212cc0aef670d96945d08fe24", "file": "SkTextBlobBuilder_Reference", "name": "SkTextBlobBuilder::make()", "stdout": "blob equals nullptr\\nblob does not equal nullptr\\nblob equals nullptr\\n"