add more fiddle hash checks

Convert some of bookmaker to use real json instead
of rolling its own. Also check to see if all
hashes are read.

TBR=jcgregario@google.com

Docs-Preview: https://skia.org/?cl=142166
Bug: skia:8151
Change-Id: Ib35ecd69648faec3522903e0b552d37b04b73f8b
Reviewed-on: https://skia-review.googlesource.com/142166
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/bookmaker/cataloger.cpp b/tools/bookmaker/cataloger.cpp
index 0e1e38ac45..c6aae74c30 100644
--- a/tools/bookmaker/cataloger.cpp
+++ b/tools/bookmaker/cataloger.cpp
@@ -79,14 +79,13 @@ bool Catalog::closeCatalog() {
 }
 
 bool Catalog::parseFromFile(const char* path) {
-    if (!INHERITED::parseSetup(path)) {
+    if (!INHERITED::parseFromFile(path)) {
         return false;
     }
     fIndent = 4;
     this->writeString("var text = {");
     this->lf(1);
     fTextOut = true;
-    TextParserSave save(this);
     if (!parseFiddles()) {
         return false;
     }
@@ -96,7 +95,8 @@ bool Catalog::parseFromFile(const char* path) {
     this->writeString("var pngs = {");
     fTextOut = false;
     fPngOut = true;
-    save.restore();
+    JsonStatus* status = &fStack.back();
+    status->fIter = status->fObject.begin();
     fContinuation = false;
     return parseFiddles();
 }