Make SkSHA1 and SkM5 use common SkDigestHash result type

gm/gmmain.cpp

Index: gm/gmmain.cpp
===================================================================
--- gm/gmmain.cpp	(revision 8685)
+++ gm/gmmain.cpp	(working copy)
@@ -714,11 +714,10 @@
                                              const char renderModeDescriptor[],
                                              bool addToJsonSummary) {
         ErrorCombination errors;
-        SkHashDigest actualBitmapHash;
-        // TODO(epoger): Better handling for error returned by ComputeDigest()?
-        // For now, we just report a digest of 0 in error cases, like before.
+        BITMAP_HASH_TYPE actualBitmapHash;
         if (!SkBitmapHasher::ComputeDigest(actualBitmap, &actualBitmapHash)) {

[epoger, 2013/04/18 18:07:13]

Unlike SkData objects, SkHashDigest objects are mutable.  That allows
ComputeDigest() to "fill in" the result in the &actualBitmapHash parameter, and
return the "success" boolean separately.

If ComputeDigest() returned its results as an SkData object, I guess it would
return that SkData object instead of a bool... but then, how would it signal
errors?  Maybe by returning an empty SkData object?  Or returning SkData *
instead of SkData, and NULL in case of an error?

I guess those approaches would work... any thoughts on what might be preferable?

-            actualBitmapHash = 0;
+            // TODO(epoger): Better handling for error returned by ComputeDigest()?
+            // For now, we just leave actualBitmapHash empty.
         }
         SkString completeNameString = baseNameString;
         completeNameString.append(renderModeDescriptor);
@@ -768,7 +767,7 @@
      * depending on status.
      */
     void add_actual_results_to_json_summary(const char testName[],
-                                            const SkHashDigest& actualBitmapHash,
+                                            const BITMAP_HASH_TYPE& actualBitmapHash,
                                             ErrorCombination result,
                                             bool ignoreFailure) {
         Json::Value actualResults;
@@ -864,11 +863,10 @@
         } else {
             // If we are running without expectations, we still want to
             // record the actual results.
-            SkHashDigest actualBitmapHash;
-            // TODO(epoger): Better handling for error returned by ComputeDigest()?
-            // For now, we just report a digest of 0 in error cases, like before.
+            BITMAP_HASH_TYPE actualBitmapHash;
             if (!SkBitmapHasher::ComputeDigest(actualBitmap, &actualBitmapHash)) {
-                actualBitmapHash = 0;
+                // TODO(epoger): Better handling for error returned by ComputeDigest()?
+                // For now, we just leave actualBitmapHash empty.
             }
             add_actual_results_to_json_summary(name.c_str(), actualBitmapHash,
                                                ErrorCombination(kMissingExpectations_ErrorType),