From ffb3d688b0e76ad7d1517657b00e4525cc603f40 Mon Sep 17 00:00:00 2001
From: Cary Clark <caryclark@skia.org>
Date: Thu, 17 May 2018 12:17:28 -0400
Subject: Color Documentation

- treat Color, ARGB, etc as things not requiring definitions
- fix links to Anti-alias, RGB-565
- finish everything marked incomplete, color and elsewhere
- add #Code blocks for #Typedef

R=caryclark@google.com
Docs-Preview: https://skia.org/?cl=128547
Bug: skia:6898
Change-Id: Icf12fe70bc2bf1a8b1a5b31380b2454610949f23
Reviewed-on: https://skia-review.googlesource.com/128547
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
---
 tools/bookmaker/definition.cpp    |  3 ---
 tools/bookmaker/includeWriter.cpp |  1 +
 tools/bookmaker/mdOut.cpp         | 23 ++++++-----------------
 3 files changed, 7 insertions(+), 20 deletions(-)

(limited to 'tools/bookmaker')

diff --git a/tools/bookmaker/definition.cpp b/tools/bookmaker/definition.cpp
index 9a6d0f6d49..1c6b1ebbe0 100644
--- a/tools/bookmaker/definition.cpp
+++ b/tools/bookmaker/definition.cpp
@@ -338,9 +338,6 @@ bool Definition::boilerplateIfDef() {
 // fixme: this will need to be more complicated to handle all of Skia
 // for now, just handle paint -- maybe fiddle will loosen naming restrictions
 void Definition::setCanonicalFiddle() {
-    if (string::npos != fName.find("SkCanvas::SaveLayerRec")) {
-        SkDebugf("");
-    }
     fMethodType = Definition::MethodType::kNone;
     size_t doubleColons = fName.find("::", 0);
     SkASSERT(string::npos != doubleColons);
diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp
index c1a98cf786..b183a958ec 100644
--- a/tools/bookmaker/includeWriter.cpp
+++ b/tools/bookmaker/includeWriter.cpp
@@ -1826,6 +1826,7 @@ string IncludeWriter::resolveRef(const char* start, const char* end, bool first,
                     ;
                 } else if (!first) {
                     this->fChar = start;
+                    this->fLine = start;
                     this->reportError("reference unfound");
                     return "";
                 }
diff --git a/tools/bookmaker/mdOut.cpp b/tools/bookmaker/mdOut.cpp
index 7f07bc2d3e..0c88727c88 100644
--- a/tools/bookmaker/mdOut.cpp
+++ b/tools/bookmaker/mdOut.cpp
@@ -334,9 +334,6 @@ string MdOut::addReferences(const char* refStart, const char* refEnd,
             continue;
         }
         ref = string(start, t.fChar - start);
-        if (fMethod && "SkSurface::MakeRenderTarget" == fMethod->fName && "is" == ref) {
-            SkDebugf("");
-        }
         if (const Definition* def = this->isDefined(t, ref, resolvable)) {
             if (MarkType::kExternal == def->fMarkType) {
                 (void) this->anchorRef("undocumented#" + ref, "");   // for anchor validate
@@ -800,9 +797,9 @@ void MdOut::summaryOut(const Definition* def, MarkType markType, string name) {
         FPRINTF("%s", odd ? kTR_Dark.c_str() : "  <tr>");
         this->lfAlways(1);
         if (MarkType::kConst == markType) {
-            FPRINTF("%s", tableDataCodeRef(def).c_str());
+            FPRINTF("%s", tableDataCodeRef(child).c_str());
             this->lfAlways(1);
-            FPRINTF("%s", table_data_const(def, nullptr).c_str());
+            FPRINTF("%s", table_data_const(child, nullptr).c_str());
         } else {
             string memberType;
             string memberName = this->getMemberTypeName(child, &memberType);
@@ -1214,9 +1211,6 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
     bool lookForOneLiner = false;
     // #Param and #Const don't have markers to say when the last is seen, so detect that by looking
     // for a change in type.
-    if (MarkType::kStruct == def->fMarkType) {
-        SkDebugf("");
-    }
     if (writeTableEnd(MarkType::kParam, def, prior) || writeTableEnd(MarkType::kConst, def, prior)
                 || writeTableEnd(MarkType::kMember, def, prior)) {
         this->writePending();
@@ -1372,6 +1366,9 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
             this->lfAlways(1);
         } break;
         case MarkType::kDefine:
+            this->mdHeaderOut(2);
+            this->htmlOut(anchorDef(def->fFiddle, "Define " + def->fName));
+            this->lf(2);
             break;
         case MarkType::kDefinedBy:
             break;
@@ -1436,7 +1433,6 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
             this->lf(2);
             break;
         case MarkType::kExternal:
-            SkDebugf("");
             break;
         case MarkType::kFormula:
             break;
@@ -1708,7 +1704,7 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
             this->lf(1);
             } break;
         case MarkType::kTypedef:
-            this->mdHeaderOut(1);
+            this->mdHeaderOut(2);
             this->htmlOut(anchorDef(def->fFiddle, "Typedef " + def->fName));
             this->lf(1);
             break;
@@ -1724,12 +1720,7 @@ void MdOut::markTypeOut(Definition* def, const Definition** prior) {
             SkASSERT(0); // handle everything
             break;
     }
- //   TableState saveState = fTableState;
-    if (def->fLineCount >= 533 && string::npos != def->fFileName.find("SkSurface")) {
-        SkDebugf("");
-    }
     this->childrenOut(def, textStart);
- //   fTableState = saveState;
     switch (def->fMarkType) {  // post child work, at least for tables
         case MarkType::kAnchor:
             if (fColumn > 0) {
@@ -1968,8 +1959,6 @@ void MdOut::populateTables(const Definition* def, RootDefinition* root) {
                 }
                 if (!builtInTopic) {
                     root->populator(SubtopicKeys::kRelatedFunctions).fMembers.push_back(child);
-                } else {
-                    SkDebugf("");
                 }
             }
             this->populateTables(child, root);
-- 
cgit v1.2.3