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

Side by Side Diff: gm/gm_expectations.h

Issue 15883004: GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") and value (12345) (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | gm/gm_expectations.cpp » ('j') | src/utils/SkBitmapHasher.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 #ifndef gm_expectations_DEFINED 7 #ifndef gm_expectations_DEFINED
8 #define gm_expectations_DEFINED 8 #define gm_expectations_DEFINED
9 9
10 #include "gm.h" 10 #include "gm.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 /** 44 /**
45 * Assembles rootPath and relativePath into a single path, like this: 45 * Assembles rootPath and relativePath into a single path, like this:
46 * rootPath/relativePath 46 * rootPath/relativePath
47 * 47 *
48 * Uses SkPATH_SEPARATOR, to work on all platforms. 48 * Uses SkPATH_SEPARATOR, to work on all platforms.
49 * 49 *
50 * TODO(epoger): This should probably move into SkOSFile.h 50 * TODO(epoger): This should probably move into SkOSFile.h
51 */ 51 */
52 SkString SkPathJoin(const char *rootPath, const char *relativePath); 52 SkString SkPathJoin(const char *rootPath, const char *relativePath);
53 53
54 Json::Value ActualResultAsJsonValue(const SkHashDigest& result); 54 Json::Value ActualResultAsJsonValue(uint64_t result);
55 55
56 Json::Value CreateJsonTree(Json::Value expectedResults, 56 Json::Value CreateJsonTree(Json::Value expectedResults,
57 Json::Value actualResultsFailed, 57 Json::Value actualResultsFailed,
58 Json::Value actualResultsFailureIgnored, 58 Json::Value actualResultsFailureIgnored,
59 Json::Value actualResultsNoComparison, 59 Json::Value actualResultsNoComparison,
60 Json::Value actualResultsSucceeded); 60 Json::Value actualResultsSucceeded);
61 61
62 /** 62 /**
63 * Test expectations (allowed image checksums, etc.) 63 * Test expectations (allowed image checksums, etc.)
64 */ 64 */
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 * Returns true if successful. 216 * Returns true if successful.
217 */ 217 */
218 static bool Parse(const char *jsonPath, Json::Value *jsonRoot); 218 static bool Parse(const char *jsonPath, Json::Value *jsonRoot);
219 219
220 Json::Value fJsonRoot; 220 Json::Value fJsonRoot;
221 Json::Value fJsonExpectedResults; 221 Json::Value fJsonExpectedResults;
222 }; 222 };
223 223
224 } 224 }
225 #endif 225 #endif
OLDNEW
« no previous file with comments | « no previous file | gm/gm_expectations.cpp » ('j') | src/utils/SkBitmapHasher.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698