diff options
| -rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
| -rw-r--r-- | tools/bookmaker/includeParser.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index e6c896fa58..8869aef68f 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -2740,11 +2740,11 @@ private: state. */ class SkAutoCanvasRestore { -public: SkAutoCanvasRestore(SkAutoCanvasRestore&&) = delete; SkAutoCanvasRestore(const SkAutoCanvasRestore&) = delete; SkAutoCanvasRestore& operator=(SkAutoCanvasRestore&&) = delete; SkAutoCanvasRestore& operator=(const SkAutoCanvasRestore&) = delete; +public: /** Preserves SkCanvas save count. Optionally saves SkCanvas clip and SkCanvas matrix. diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp index 2a1e03b79e..d6aa447fc4 100644 --- a/tools/bookmaker/includeParser.cpp +++ b/tools/bookmaker/includeParser.cpp @@ -1368,7 +1368,9 @@ bool IncludeParser::parseClass(Definition* includeDef, IsStruct isStruct) { const char* privateName = kKeyWords[(int) KeyWord::kPrivate].fName; size_t privateLen = strlen(privateName); auto childIter = includeDef->fChildren.begin(); - std::advance(childIter, publicIndex); + while ((*childIter)->fPrivate) { + std::advance(childIter, 1); + } while (childIter != includeDef->fChildren.end()) { Definition* child = *childIter; while (child->fParentIndex > keyIndex && iter != includeDef->fTokens.end()) { |