commit b0ba2ac392722a9c451854d7f066f929a9c811b7
author Cary Clark <caryclark@skia.org> Mon Oct 15 11:38:31 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 15 16:11:56 2018 +0000
tree a8bed417f75c1d3eb62a5cb807aab7e70dc22cce
parent 56d19a5707c61892aca42c4fdbc439459bce92b1

fix bookmaker

New canvas struct hit some unimplemented
corners in bookmaker.

TBR=bsalomon@google.com

Docs-Preview: https://skia.org/?cl=162032
Bug: skia:
Change-Id: I3172340d8653d9ab76c0a59683cd91f0fbccfacc
Reviewed-on: https://skia-review.googlesource.com/c/162032
Commit-Queue: Cary Clark <caryclark@skia.org>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>

docs/SkCanvas_Reference.bmh

diff --git a/docs/SkCanvas_Reference.bmh b/docs/SkCanvas_Reference.bmh
index 1da0046..4cf2ca6 100644
--- a/docs/SkCanvas_Reference.bmh
+++ b/docs/SkCanvas_Reference.bmh
@@ -4966,6 +4966,7 @@
 ##
 
 #Private
+Do not use.
 ##
 
 #Const kLeft_QuadAAFlag 1
@@ -5000,7 +5001,13 @@
 
 #Struct ImageSetEntry
 #Line # don't use this ##
+
+#Code
+#Populate
+##
+
 #Private
+Do not use.
 ##
 
 #Member SkImage* fImage
@@ -5029,6 +5036,7 @@
 #Method void experimental_DrawImageSetV0(const ImageSetEntry imageSet[], int cnt, float alpha,
                                          SkFilterQuality quality, SkBlendMode mode);
 #Private
+Do not use.
 ##
 #In Draw_Image
 #In Draw

site/user/api/SkCanvas_Reference.md

diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md
index c5ec6ee..9fd696b 100644
--- a/site/user/api/SkCanvas_Reference.md
+++ b/site/user/api/SkCanvas_Reference.md
@@ -5109,7 +5109,7 @@
     };
 </pre>
 
-Private:
+Private: Do not use.
 
 ### Constants
 
@@ -5155,7 +5155,12 @@
   </tr>
 </table>
 
-<a name='SkCanvas_ImageSetEntry'></a>Private:<table style='border-collapse: collapse; width: 62.5em'>
+<a name='SkCanvas_ImageSetEntry'></a>
+
+<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
+</pre>
+
+Private: Do not use.<table style='border-collapse: collapse; width: 62.5em'>
 
   <tr><th style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>Type</th>
 <th style='text-align: left; border: 2px solid #dddddd; padding: 8px; '>Member</th>
@@ -5194,7 +5199,7 @@
                                  <a href='undocumented#SkFilterQuality'>SkFilterQuality</a> quality, <a href='SkBlendMode_Reference#SkBlendMode'>SkBlendMode</a> mode) ;
 </pre>
 
-Private:
+Private: Do not use.
 
 Draws a set of images. Do not use this method.
 

tools/bookmaker/includeWriter.cpp

diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp
index 69e4557..713535f 100644
--- a/tools/bookmaker/includeWriter.cpp
+++ b/tools/bookmaker/includeWriter.cpp
@@ -1196,6 +1196,10 @@
                 }
                 break;
             }
+            if (Bracket::kAngle == token.fBracket) {
+                // in template param
+                continue;
+            }
             SkASSERT(0); // incomplete
         }
         if (Definition::Type::kKeyWord == token.fType) {
@@ -1212,6 +1216,7 @@
                 case KeyWord::kUint32_t:
                 case KeyWord::kUint64_t:
                 case KeyWord::kUintPtr_t:
+                case KeyWord::kUnsigned:
                 case KeyWord::kSize_t:
                 case KeyWord::kFloat:
                 case KeyWord::kBool: