diff options
Diffstat (limited to 'tools/bookmaker')
| -rw-r--r-- | tools/bookmaker/bookmaker.h | 1 | ||||
| -rw-r--r-- | tools/bookmaker/includeParser.cpp | 1 | ||||
| -rw-r--r-- | tools/bookmaker/includeWriter.cpp | 2 | ||||
| -rw-r--r-- | tools/bookmaker/parserCommon.cpp | 7 |
4 files changed, 11 insertions, 0 deletions
diff --git a/tools/bookmaker/bookmaker.h b/tools/bookmaker/bookmaker.h index c755beec43..322aa4c446 100644 --- a/tools/bookmaker/bookmaker.h +++ b/tools/bookmaker/bookmaker.h @@ -76,6 +76,7 @@ enum class KeyWord { kUint32_t, kUint64_t, kUint8_t, + kUintPtr_t, kUnion, kUnsigned, kVoid, diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp index ebc2384d61..12bd787eb8 100644 --- a/tools/bookmaker/includeParser.cpp +++ b/tools/bookmaker/includeParser.cpp @@ -50,6 +50,7 @@ const IncludeKey kKeyWords[] = { { "uint32_t", KeyWord::kUint32_t, KeyProperty::kNumber }, { "uint64_t", KeyWord::kUint64_t, KeyProperty::kNumber }, { "uint8_t", KeyWord::kUint8_t, KeyProperty::kNumber }, + { "uintptr_t", KeyWord::kUintPtr_t, KeyProperty::kNumber }, { "union", KeyWord::kUnion, KeyProperty::kObject }, { "unsigned", KeyWord::kUnsigned, KeyProperty::kNumber }, { "void", KeyWord::kVoid, KeyProperty::kNumber }, diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp index b183a958ec..62e8205e3d 100644 --- a/tools/bookmaker/includeWriter.cpp +++ b/tools/bookmaker/includeWriter.cpp @@ -1018,6 +1018,7 @@ void IncludeWriter::structSizeMembers(const Definition& child) { case KeyWord::kUint16_t: case KeyWord::kUint32_t: case KeyWord::kUint64_t: + case KeyWord::kUintPtr_t: case KeyWord::kSize_t: case KeyWord::kFloat: case KeyWord::kBool: @@ -1502,6 +1503,7 @@ bool IncludeWriter::populate(Definition* def, ParentPair* prevPair, RootDefiniti case KeyWord::kUint16_t: case KeyWord::kUint32_t: case KeyWord::kUint64_t: + case KeyWord::kUintPtr_t: case KeyWord::kUnsigned: case KeyWord::kSize_t: case KeyWord::kFloat: diff --git a/tools/bookmaker/parserCommon.cpp b/tools/bookmaker/parserCommon.cpp index 0ce45dc1ff..3733aed366 100644 --- a/tools/bookmaker/parserCommon.cpp +++ b/tools/bookmaker/parserCommon.cpp @@ -23,6 +23,13 @@ bool ParserCommon::parseFile(const char* fileOrPath, const char* suffix, OneFile } else if (OneFile::kNo == oneFile) { SkOSFile::Iter it(fileOrPath, suffix); for (SkString file; it.next(&file); ) { + // FIXME: skip difficult file for now + if (string::npos != string(file.c_str()).find("SkFontArguments")) { + continue; + } + if (string::npos != string(file.c_str()).find("SkFontStyle")) { + continue; + } SkString p = SkOSPath::Join(fileOrPath, file.c_str()); const char* hunk = p.c_str(); if (!SkStrEndsWith(hunk, suffix)) { |