Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: gm/gm_expectations.h

Issue 14670021: Write/compare against expectations in skimage tool. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Instead of appending a string of potentially infinite length, append a single character. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gm/gm_expectations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/gm_expectations.h
diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h
index 2506a98127a8057aa62e515766eca29885a4e476..0af18c157084a3146e08e23bbb7e99e1300396a6 100644
--- a/gm/gm_expectations.h
+++ b/gm/gm_expectations.h
@@ -39,26 +39,12 @@ namespace skiagm {
return jsonValue.asUInt64();
}
- static void gm_fprintf(FILE *stream, const char format[], ...) {
- va_list args;
- va_start(args, format);
- fprintf(stream, "GM: ");
- vfprintf(stream, format, args);
- va_end(args);
- }
+ void gm_fprintf(FILE *stream, const char format[], ...);
- static SkString make_filename(const char path[],
- const char renderModeDescriptor[],
- const char *name,
- const char suffix[]) {
- SkString filename(path);
- if (filename.endsWith(SkPATH_SEPARATOR)) {
- filename.remove(filename.size() - 1, 1);
- }
- filename.appendf("%c%s%s.%s", SkPATH_SEPARATOR,
- name, renderModeDescriptor, suffix);
- return filename;
- }
+ SkString make_filename(const char path[],
+ const char renderModeDescriptor[],
+ const char *name,
+ const char suffix[]);
Json::Value ActualResultAsJsonValue(const SkHashDigest& result);
@@ -208,15 +194,15 @@ namespace skiagm {
*/
// TODO(epoger): Move this, into SkStream.[cpp|h] as attempted in
// https://codereview.appspot.com/7300071 ?
- // And maybe readFileIntoSkData() also?
- static SkData* readIntoSkData(SkStream &stream, size_t maxBytes);
+ // And maybe ReadFileIntoSkData() also?
+ static SkData* ReadIntoSkData(SkStream &stream, size_t maxBytes);
/**
- * Wrapper around readIntoSkData for files: reads the entire file into
+ * Wrapper around ReadIntoSkData for files: reads the entire file into
* an SkData object.
*/
- static SkData* readFileIntoSkData(SkFILEStream &stream) {
- return readIntoSkData(stream, stream.getLength());
+ static SkData* ReadFileIntoSkData(SkFILEStream &stream) {
+ return ReadIntoSkData(stream, stream.getLength());
}
/**
@@ -224,7 +210,7 @@ namespace skiagm {
*
* Returns true if successful.
*/
- static bool parse(const char *jsonPath, Json::Value *jsonRoot);
+ static bool Parse(const char *jsonPath, Json::Value *jsonRoot);
Json::Value fJsonRoot;
Json::Value fJsonExpectedResults;
« no previous file with comments | « no previous file | gm/gm_expectations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698