commit 2a8c48be4ff65d873d9d5ba65ecef989d82dd0be
author Cary Clark <caryclark@skia.org> Thu Feb 15 17:31:24 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 16 15:35:36 2018 +0000
tree 184c3941e072103ec71ae30363098d0f9e953443
parent 6848b716f7d51a2456535f9a1a5e1bed725fdd64

improve bookmaker defines and references

generating replacement includes exposed
errors mostly dealing with globals like
SkAlphaType and members. Rewrite finding
and resolving links to hopefully make this
area more robust.

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

tools/bookmaker/includeWriter.cpp

diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp
index 7161940..61011e4 100644
--- a/tools/bookmaker/includeWriter.cpp
+++ b/tools/bookmaker/includeWriter.cpp
@@ -640,9 +640,6 @@
 
 // walk children and output complete method doxygen description
 void IncludeWriter::methodOut(const Definition* method, const Definition& child) {
-    if (string::npos != method->fName.find("scalePixels")) {
-        SkDebugf("");
-    }
     if (fPendingMethod) {
         fIndent -= 4;
         fPendingMethod = false;
@@ -1781,15 +1778,8 @@
                         MarkType::kEnumClass == parent->fMarkType) {
                     if (parent->fParent != fRootTopic) {
                         substitute = parent->fName;
-                        size_t under = undername.find('_');
-                        if (string::npos != under) {
-                            string secondHalf(&undername[under],
-                                    (size_t) (undername.length() - under));
-                            substitute += ConvertRef(secondHalf, false);
-                        } else {
-                            substitute += ' ';
-                            substitute += ConvertRef(undername, false);
-                        }
+                        substitute += ' ';
+                        substitute += ConvertRef(undername, false);
                     } else {
                         substitute += ConvertRef(undername, first);
                     }
@@ -1801,9 +1791,6 @@
     if (first && isupper(start[0]) && substitute.length() > 0 && islower(substitute[0])) {
         substitute[0] = start[0];
     }
-    if (undername == "Color_Type" && substitute == "") {
-        SkDebugf("");
-    }
     return substitute;
 }
 
@@ -1859,9 +1846,6 @@
             temp = ConvertRef(resolved, false);
         }
     }
-    if (resolved == "Color_Type" && temp == "color type") {
-        SkDebugf("");
-    }
     if (temp.length()) {
         if (start > lastWrite) {
             SkASSERT(data[start - 1] >= ' ');