GM: allow caller to specify which result types trigger an error

gm/gm_error.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Error codes used by gmmain.cpp.
  */
@@ skipping 40 matching lines @@
             return "MissingExpectations";
         case kWritingReferenceImage_ErrorType:
             return "WritingReferenceImage";
         }
         // control should never reach here
         SkDEBUGFAIL("getErrorTypeName() called with unknown type");
         return "Unknown";
     }
 
     /**
+     * Fills in "type" with the ErrorType associated with name "name".
+     * Returns true if we found one, false if it is an unknown type name.
+     */
+    static bool getErrorTypeByName(const char name[], ErrorType *type) {
+        // TODO(epoger): how can we make sure this method stays in sync with the
+        // complete list of ErrorTypes?  Unlike getErrorTypeName(), in this case
+        // we don't have the compiler warning about missing enum values to keep
+        // us in sync...
+        if (0 == strcmp(name, "NoGpuContext")) {

[borenet, 2013/04/12 00:29:45]

Suggest making these strings constant and using them in getErrorTypeName above. 
There's probably some macro magic that can be done to convert back and forth,
but that probably isn't necessary.

[epoger, 2013/04/12 02:44:43]

Hey, I came up with an elegant, robust (IMHO) approach in patchset 3.  Whaddaya
think?

[borenet, 2013/04/12 11:55:37]

I like it!

+            *type = kNoGpuContext_ErrorType;
+            return true;
+        }
+        if (0 == strcmp(name, "IntentionallySkipped")) {
+            *type = kIntentionallySkipped_ErrorType;
+            return true;
+        }
+        if (0 == strcmp(name, "RenderModeMismatch")) {
+            *type = kRenderModeMismatch_ErrorType;
+            return true;
+        }
+        if (0 == strcmp(name, "ExpectationsMismatch")) {
+            *type = kExpectationsMismatch_ErrorType;
+            return true;
+        }
+        if (0 == strcmp(name, "MissingExpectations")) {
+            *type = kMissingExpectations_ErrorType;
+            return true;
+        }
+        if (0 == strcmp(name, "WritingReferenceImage")) {
+            *type = kWritingReferenceImage_ErrorType;
+            return true;
+        }
+        return false;
+    }
+
+    /**
      * A combination of 0 or more ErrorTypes.
      */
     class ErrorCombination {
     public:
         ErrorCombination() : fBitfield(0) {}
         ErrorCombination(const ErrorType type) : fBitfield(1 << type) {}
 
         /**
          * Returns true iff there are NO errors.
          */
@@ skipping 16 matching lines @@
         }
 
         /**
          * Returns true iff this ErrorCombination includes this ErrorType.
          */
         bool includes(const ErrorType type) const {
             return !(0 == (this->fBitfield & (1 << type)));
         }
 
         /**
+         * Returns a string representation of all ErrorTypes in this
+         * ErrorCombination.
+         *
+         * @param separator text with which to separate ErrorType names
+         */
+        SkString asString(const char separator[]) const {
+            SkString s;
+            int howMany = 0;
+            for (int typeInt = 0; typeInt <= kLast_ErrorType; typeInt++) {
+                ErrorType type = static_cast<ErrorType>(typeInt);
+                if (this->includes(type)) {
+                    if (0 < howMany++) {

[borenet, 2013/04/12 00:29:45]

Is this significantly faster than (s.size() == 0)?

[epoger, 2013/04/12 02:44:43]

Probably not.  Now calling s.isEmpty()... thanks for the suggestion

+                        s.append(separator);
+                    }
+                    s.append(getErrorTypeName(type));
+                }
+            }
+            return s;
+        }
+
+        /**
          * Returns a new ErrorCombination, which includes the union of all
          * ErrorTypes in two ErrorCombination objects (this and other).
          */
         ErrorCombination plus(const ErrorCombination& other) const {
             ErrorCombination retval;
             retval.fBitfield = this->fBitfield | other.fBitfield;
             return retval;
         }
 
         /**
          * Returns a new ErrorCombination, which is a copy of "this"
          * but with all ErrorTypes in "other" removed.
          */
         ErrorCombination minus(const ErrorCombination& other) const {
             ErrorCombination retval;
             retval.fBitfield = this->fBitfield & ~(other.fBitfield);
             return retval;
         }
 
     private:
         int fBitfield;
     };
 
     // No errors at all.
     const static ErrorCombination kEmpty_ErrorCombination;
 }
 
 #endif // ifndef gm_error_DEFINED