From 37c772ae2d96dad9b6e430e9bb6450193a545021 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 29 May 2014 17:10:24 +0000 Subject: Reland https://codereview.chromium.org/286903025 BUG=skia: R=bensong@google.com, epoger@google.com Author: kelvinly@google.com Review URL: https://codereview.chromium.org/304613002 git-svn-id: http://skia.googlecode.com/svn/trunk@14966 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/ResultsWriter.h | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'bench/ResultsWriter.h') diff --git a/bench/ResultsWriter.h b/bench/ResultsWriter.h index a9eef802bd..c66593864f 100644 --- a/bench/ResultsWriter.h +++ b/bench/ResultsWriter.h @@ -101,26 +101,9 @@ private: * }, * ... */ -class JSONResultsWriter : public ResultsWriter { -private: - Json::Value* find_named_node(Json::Value* root, const char name[]) { - Json::Value* search_results = NULL; - for(Json::Value::iterator iter = root->begin(); - iter!= root->end(); ++iter) { - if(SkString(name).equals((*iter)["name"].asCString())) { - search_results = &(*iter); - break; - } - } - if(search_results != NULL) { - return search_results; - } else { - Json::Value* new_val = &(root->append(Json::Value())); - (*new_val)["name"] = name; - return new_val; - } - } +Json::Value* SkFindNamedNode(Json::Value* root, const char name[]); +class JSONResultsWriter : public ResultsWriter { public: explicit JSONResultsWriter(const char filename[]) : fFilename(filename) @@ -138,12 +121,12 @@ public: sk_name.appendS32(x); sk_name.append("_"); sk_name.appendS32(y); - Json::Value* bench_node = find_named_node(&fResults, sk_name.c_str()); + Json::Value* bench_node = SkFindNamedNode(&fResults, sk_name.c_str()); fBench = &(*bench_node)["results"]; } virtual void config(const char name[]) { SkASSERT(NULL != fBench); - fConfig = find_named_node(fBench, name); + fConfig = SkFindNamedNode(fBench, name); } virtual void timer(const char name[], double ms) { SkASSERT(NULL != fConfig); @@ -164,6 +147,7 @@ private: }; #endif // SK_BUILD_JSON_WRITER + /** * This ResultsWriter writes out to multiple ResultsWriters. */ -- cgit v1.2.3