commit 114b5af0e8cc5418e815f42de6d6733f89caca44
author Herb Derby <herb@google.com> Wed Jan 23 14:24:14 2019 -0500
committer Herb Derby <herb@google.com> Wed Jan 23 19:49:18 2019 +0000
tree 4c7fb27fb0997abe59b9105e1acbd1fa80e5aab3
parent 94633de528f45e51dfd299f80ce0731e5d155e3e

Fix bookmaker

Change-Id: Ib2bf75cbe00a629dccaa5df1407e836dd61c1157
Reviewed-on: https://skia-review.googlesource.com/c/186280
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

docs/SkFont_Reference.bmh

diff --git a/docs/SkFont_Reference.bmh b/docs/SkFont_Reference.bmh
index 7d5bbef..43a744c 100644
--- a/docs/SkFont_Reference.bmh
+++ b/docs/SkFont_Reference.bmh
@@ -521,6 +521,22 @@
 
 # ------------------------------------------------------------------------------
 
+#Method SkTypeface* getTypefaceOrDefault() const
+#In incomplete
+#Line # incomplete ##
+
+#Populate
+
+#Example
+// incomplete
+##
+
+#SeeAlso incomplete
+
+#Method ##
+
+# ------------------------------------------------------------------------------
+
 #Method SkScalar    getSize() const
 #In incomplete
 #Line # incomplete ##
@@ -585,6 +601,22 @@
 
 # ------------------------------------------------------------------------------
 
+#Method sk_sp<SkTypeface> refTypefaceOrDefault() const
+#In incomplete
+#Line # incomplete ##
+
+#Populate
+
+#Example
+// incomplete
+##
+
+#SeeAlso incomplete
+
+#Method ##
+
+# ------------------------------------------------------------------------------
+
 #Method void setTypeface(sk_sp<SkTypeface> tf)
 #In incomplete
 #Line # incomplete ##
@@ -766,13 +798,13 @@
 #Method ##
 
 # ------------------------------------------------------------------------------
-

-#Method size_t breakText(const void* text, size_t length, SkTextEncoding encoding, SkScalar maxWidth,

-                     SkScalar* measuredWidth = nullptr) const

-#In  incomplete

-#Line # incomplete ##

-#Populate

-

+
+#Method size_t breakText(const void* text, size_t length, SkTextEncoding encoding, SkScalar maxWidth,
+                     SkScalar* measuredWidth = nullptr) const
+#In  incomplete
+#Line # incomplete ##
+#Populate
+
 #Example
     #Description
     Line under "Breakfast" shows desired width, shorter than available characters.
@@ -795,11 +827,11 @@
             canvas->drawLine(25, 60, 25 + 100, 60, paint);
             canvas->drawLine(25, 110, 25 + measuredWidth, 110, paint);
         }
-##

-

-#SeeAlso incomplete

-

-#Method ##

+##
+
+#SeeAlso incomplete
+
+#Method ##
 
 # ------------------------------------------------------------------------------
 
@@ -951,25 +983,25 @@
     ##
     #Height 128
     void draw(SkCanvas* canvas) {
-        SkPaint paint;

-        SkFont font(nullptr, 80);

-        SkPath onePath, path, path2;

-        const char str[] = "ABC";

-        const int bytes = sizeof(str) - 1;

-        int count = font.textToGlyphs(str, bytes, SkTextEncoding::kUTF8, nullptr, 0);

-        std::vector<SkGlyphID> glyphs;

-        glyphs.resize(count);

-        (void) font.textToGlyphs(str, bytes, SkTextEncoding::kUTF8, &glyphs.front(), count);

-        int xPos = 20;

-        for (auto oneGlyph : glyphs) {

-            font.getPath(oneGlyph, &onePath);

-            path.addPath(onePath, xPos, 60);

-            xPos += 60;

-        }

-        path.offset(20, 20, &path2);

-        Op(path, path2, SkPathOp::kDifference_SkPathOp, &path);

-        path.addPath(path2);

-        paint.setStyle(SkPaint::kStroke_Style);

+        SkPaint paint;
+        SkFont font(nullptr, 80);
+        SkPath onePath, path, path2;
+        const char str[] = "ABC";
+        const int bytes = sizeof(str) - 1;
+        int count = font.textToGlyphs(str, bytes, SkTextEncoding::kUTF8, nullptr, 0);
+        std::vector<SkGlyphID> glyphs;
+        glyphs.resize(count);
+        (void) font.textToGlyphs(str, bytes, SkTextEncoding::kUTF8, &glyphs.front(), count);
+        int xPos = 20;
+        for (auto oneGlyph : glyphs) {
+            font.getPath(oneGlyph, &onePath);
+            path.addPath(onePath, xPos, 60);
+            xPos += 60;
+        }
+        path.offset(20, 20, &path2);
+        Op(path, path2, SkPathOp::kDifference_SkPathOp, &path);
+        path.addPath(path2);
+        paint.setStyle(SkPaint::kStroke_Style);
         canvas->drawPath(path, paint);
     }
 ##