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>
diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp
index 9006176..8365a82 100644
--- a/tools/bookmaker/includeParser.cpp
+++ b/tools/bookmaker/includeParser.cpp
@@ -1360,9 +1360,12 @@
     const char* nameStart = enumName.fChar;
     enumName.skipToSpace();
     if (markupDef) {
-        markupChild->fName = markupDef->fName + "::";
+        markupChild->fName = markupDef->fName + "::" +
+                string(nameStart, (size_t) (enumName.fChar - nameStart));
     }
-    markupChild->fName += string(nameStart, (size_t) (enumName.fChar - nameStart));
+    if (string::npos != markupChild->fName.find("SkColorType")) {
+        SkDebugf("");
+    }
     if (!this->findComments(*child, markupChild)) {
         return false;
     }