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

Unified Diff: gm/gmmain.cpp

Issue 14265010: Make SkSHA1 and SkM5 use common SkDigestHash result type (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: rename_set_to_copyFrom Created 7 years, 8 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
Index: gm/gmmain.cpp
===================================================================
--- gm/gmmain.cpp (revision 8685)
+++ gm/gmmain.cpp (working copy)
@@ -714,7 +714,7 @@
const char renderModeDescriptor[],
bool addToJsonSummary) {
ErrorCombination errors;
- SkHashDigest actualBitmapHash;
+ SkUInt64HashDigest actualBitmapHash;
// TODO(epoger): Better handling for error returned by ComputeDigest()?
// For now, we just report a digest of 0 in error cases, like before.
if (!SkBitmapHasher::ComputeDigest(actualBitmap, &actualBitmapHash)) {
@@ -768,7 +768,7 @@
* depending on status.
*/
void add_actual_results_to_json_summary(const char testName[],
- const SkHashDigest& actualBitmapHash,
+ const SkUInt64HashDigest& actualBitmapHash,
ErrorCombination result,
bool ignoreFailure) {
Json::Value actualResults;
@@ -864,7 +864,7 @@
} else {
// If we are running without expectations, we still want to
// record the actual results.
- SkHashDigest actualBitmapHash;
+ SkUInt64HashDigest actualBitmapHash;
// TODO(epoger): Better handling for error returned by ComputeDigest()?
// For now, we just report a digest of 0 in error cases, like before.
if (!SkBitmapHasher::ComputeDigest(actualBitmap, &actualBitmapHash)) {
« no previous file with comments | « gm/gm_expectations.h ('k') | src/utils/SkBitmapHasher.h » ('j') | src/utils/SkHashDigest.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698