more SkImageInfo docs

fix a couple of fiddles with changed output
rewrite some SkSurface image makers
move towards replacing SkImageInfo.h

R=caryclark@google.com

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

1 files changed, 6 insertions, 0 deletions

diff --git a/tools/bookmaker/bookmaker.cpp b/tools/bookmaker/bookmaker.cpp
index 91e4cc2b23..4016a19439 100644
--- a/tools/bookmaker/bookmaker.cpp
+++ b/tools/bookmaker/bookmaker.cpp
@@ -154,6 +154,9 @@ bool BmhParser::addDefinition(const char* defStart, bool hasEnd, MarkType markTy
                 if (!this->popParentStack(definition)) {
                     return false;
                 }
+                if (fRoot == definition) {
+                    fRoot = nullptr;
+                }
             } else {
                 definition->fStart = defStart;
                 this->skipSpace();
@@ -1051,6 +1054,9 @@ bool BmhParser::findDefinitions() {
     const char* lastMC = nullptr;
     fParent = nullptr;
     while (!this->eof()) {
+        if (195 == fLineCount && "docs\\SkImageInfo_Reference.bmh" == fFileName) {
+            SkDebugf("");
+        }
         if (this->peek() == fMC) {
             lastMC = fChar;
             this->next();