working on SkImage docs
also fix minor break in SkSurface
TBR=caryclark@google.com
Docs-Preview: https://skia.org/?cl=105021
Bug: skia:
Change-Id: I0cfc01ab5ba4df13a9e84f8dd2904d32e5726a5b
Reviewed-on: https://skia-review.googlesource.com/105021
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp
index b4b0f0f..385b9c9 100644
--- a/tools/bookmaker/includeParser.cpp
+++ b/tools/bookmaker/includeParser.cpp
@@ -342,8 +342,10 @@
def = root->find(withParens, RootDefinition::AllowParens::kNo);
}
if (!def) {
- SkDebugf("method missing from bmh: %s\n", fullName.c_str());
- fFailed = true;
+ if (!root->fDeprecated) {
+ SkDebugf("method missing from bmh: %s\n", fullName.c_str());
+ fFailed = true;
+ }
break;
}
if (def->crossCheck2(token)) {
@@ -389,8 +391,10 @@
def = root->find(anonName, RootDefinition::AllowParens::kYes);
}
if (!def) {
- SkDebugf("enum missing from bmh: %s\n", fullName.c_str());
- fFailed = true;
+ if (!root->fDeprecated) {
+ SkDebugf("enum missing from bmh: %s\n", fullName.c_str());
+ fFailed = true;
+ }
break;
}
}
@@ -402,8 +406,10 @@
}
}
if (MarkType::kCode != def->fMarkType) {
- SkDebugf("enum code missing from bmh: %s\n", fullName.c_str());
- fFailed = true;
+ if (!root->fDeprecated) {
+ SkDebugf("enum code missing from bmh: %s\n", fullName.c_str());
+ fFailed = true;
+ }
break;
}
if (def->crossCheck(token)) {
@@ -423,8 +429,10 @@
}
if (!def) {
if (string::npos == child->fName.find("Legacy_")) {
- SkDebugf("const missing from bmh: %s\n", constName.c_str());
- fFailed = true;
+ if (!root->fDeprecated) {
+ SkDebugf("const missing from bmh: %s\n", constName.c_str());
+ fFailed = true;
+ }
}
} else {
def->fVisited = true;
@@ -434,7 +442,7 @@
case MarkType::kMember:
if (def) {
def->fVisited = true;
- } else {
+ } else if (!root->fDeprecated) {
SkDebugf("member missing from bmh: %s\n", fullName.c_str());
fFailed = true;
}
@@ -442,7 +450,7 @@
case MarkType::kTypedef:
if (def) {
def->fVisited = true;
- } else {
+ } else if (!root->fDeprecated) {
SkDebugf("typedef missing from bmh: %s\n", fullName.c_str());
fFailed = true;
}
@@ -475,7 +483,7 @@
}
if (crossChecks) {
if (1 == crossChecks) {
- SkDebugf("%s", firstCheck.c_str());
+ SkDebugf(" %s", firstCheck.c_str());
}
SkDebugf("\n");
}