sync docs up with tip of tree

Also check in work in progress for blend modes,
round rects, and a placeholder for pictures.

One minor include change to add a parameter name
for SkBlendMode function.

TBR=reed@google.com
R=caryclark@google.com

Docs-Preview: https://skia.org/?cl=134200
Bug: skia:6898
Change-Id: I5d2a9221d61edb32d9c7edbb3193401605b2b513
Reviewed-on: https://skia-review.googlesource.com/134200
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>

1 files changed, 20 insertions, 5 deletions

diff --git a/tools/bookmaker/mdOut.cpp b/tools/bookmaker/mdOut.cpp
index 76df5daca0..653ca5e2f3 100644
--- a/tools/bookmaker/mdOut.cpp
+++ b/tools/bookmaker/mdOut.cpp
@@ -835,7 +835,8 @@ Definition* MdOut::csParent() {
                 break;
             }
         }
-        SkASSERT(csParent || string::npos == fRoot->fFileName.find("Sk"));
+        SkASSERT(csParent || string::npos == fRoot->fFileName.find("Sk")
+                || string::npos != fRoot->fFileName.find("SkBlendMode_Reference.bmh"));
     }
     return csParent;
 }
@@ -1370,8 +1371,6 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
             this->htmlOut(anchorDef(def->fFiddle, "Define " + def->fName));
             this->lf(2);
             break;
-        case MarkType::kDefinedBy:
-            break;
         case MarkType::kDeprecated:
             this->writeString("Deprecated.");
             this->lf(2);
@@ -1444,6 +1443,10 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
             break;
         case MarkType::kIllustration: {
             string illustName = "Illustrations_" + def->fParent->fFiddle;
+            string number = string(def->fContentStart, def->length());
+            if (number.length() && "1" != number) {
+                illustName += "_" + number;
+            }
             auto illustIter = fBmhParser.fTopicMap.find(illustName);
             SkASSERT(fBmhParser.fTopicMap.end() != illustIter);
             Definition* illustDef = illustIter->second;
@@ -2117,9 +2120,16 @@ void MdOut::subtopicsOut(Definition* def) {
 }
 
 void MdOut::subtopicOut(string name) {
+    const Definition* topicParent = fSubtopic ? fSubtopic->topicParent() : nullptr;
     Definition* csParent = this->csParent();
+    if (!csParent) {
+        auto csIter = std::find_if(topicParent->fChildren.begin(), topicParent->fChildren.end(),
+                [](const Definition* def){ return MarkType::kEnum == def->fMarkType
+                || MarkType::kEnumClass == def->fMarkType; } );
+        SkASSERT(topicParent->fChildren.end() != csIter);
+        csParent = *csIter;
+    }
     SkASSERT(csParent);
-    const Definition* topicParent = fSubtopic ? fSubtopic->topicParent() : nullptr;
     this->lfAlways(1);
     if (fPopulators.end() != fPopulators.find(name)) {
         const SubtopicDescriptions& tableDescriptions = this->populator(name);
@@ -2148,6 +2158,11 @@ void MdOut::subtopicOut(string name) {
             continue;
         }
         size_t start = entry->fName.find_last_of("::");
+        if (MarkType::kConst == entry->fMarkType && entry->fParent
+                && MarkType::kEnumClass == entry->fParent->fMarkType
+                && string::npos != start && start > 1) {
+            start = entry->fName.substr(0, start - 1).rfind("::");
+        }
         string entryName = entry->fName.substr(string::npos == start ? 0 : start + 1);
         items[entryName] = entry;
     }
@@ -2199,5 +2214,5 @@ void MdOut::subtopicOut(string name) {
         }
     }
     FPRINTF("</table>");
-    this->lfAlways(1);
+    this->lf(2);
 }