update image doc and minor bookmaker fixes

image doc is still a work in progress.
Update online version to latest; updating
include header is still a ways off.

Remove SkPaint::flatten() example since
parameter is not publicly accessible.

Minor changes to fix typedef and std::function
references.

TBR=rmistry@google.com
Docs-Preview: https://skia.org/?cl=87120
Bug: skia:6898
Change-Id: I3553bc5fca97c5997aa61ea034b5ca10cb10df75
Reviewed-on: https://skia-review.googlesource.com/87120
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/tools/bookmaker/bookmaker.cpp b/tools/bookmaker/bookmaker.cpp
index b4db36a2e1..2677621ee1 100644
--- a/tools/bookmaker/bookmaker.cpp
+++ b/tools/bookmaker/bookmaker.cpp
@@ -1074,8 +1074,8 @@ string TextParser::typedefName() {
     if (!end) {
         return this->reportError<string>("missing typedef std::function end bracket >");
     }
-
-    if (this->startsWith("std::function")) {
+    bool stdFunction = this->startsWith("std::function");
+    if (stdFunction) {
         if (!this->skipToEndBracket('>')) {
             return this->reportError<string>("missing typedef std::function end bracket >");
         }
diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp
index 2846614d44..da2ee54c2e 100644
--- a/tools/bookmaker/includeParser.cpp
+++ b/tools/bookmaker/includeParser.cpp
@@ -1731,6 +1731,8 @@ bool IncludeParser::parseTemplate() {
 
 bool IncludeParser::parseTypedef(Definition* child, Definition* markupDef) {
     TextParser typedefParser(child);
+    typedefParser.skipExact("typedef");
+    typedefParser.skipWhiteSpace();
     string nameStr = typedefParser.typedefName();
     if (!markupDef) {
         Definition& typedefDef = fITypedefMap[nameStr];