diff options
author | 2013-04-03 17:12:42 +0000 | |
---|---|---|
committer | 2013-04-03 17:12:42 +0000 | |
commit | 2212c2e35cd88e9aa2d8d0171d13ea326a2d969a (patch) | |
tree | 34268795367ee626bee36374ab8cf282f1a1e7df /gm/gm_error.h | |
parent | f60494ba0b980b94ebe821539ae30dbb63d7fcc6 (diff) |
roll out r8514
Review URL: https://codereview.chromium.org/13503003
git-svn-id: http://skia.googlecode.com/svn/trunk@8515 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gm_error.h')
-rw-r--r-- | gm/gm_error.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/gm/gm_error.h b/gm/gm_error.h index 88040d6aac..e0dbf1c4ad 100644 --- a/gm/gm_error.h +++ b/gm/gm_error.h @@ -9,23 +9,15 @@ * Error codes used by gmmain.cpp. */ -#ifndef gm_error_DEFINED -#define gm_error_DEFINED - -#include "gm.h" - namespace skiagm { /** * The complete list of error types we might encounter in GM. */ enum ErrorType { - // Even though kNoGpuContext_ErrorType only occurs when SK_SUPPORT_GPU - // is turned on, we always include this type in our enum so that - // reports will be consistent whether SK_SUPPORT_GPU is turned on - // or off (as long as the number of these errors is 0). +#if SK_SUPPORT_GPU kNoGpuContext_ErrorType, - +#endif kImageMismatch_ErrorType, kMissingExpectations_ErrorType, kWritingReferenceImage_ErrorType, @@ -33,25 +25,6 @@ namespace skiagm { }; /** - * Returns the name of the given ErrorType. - */ - const char *getErrorTypeName(ErrorType type) { - switch(type) { - case kNoGpuContext_ErrorType: - return "NoGpuContext"; - case kImageMismatch_ErrorType: - return "ImageMismatch"; - case kMissingExpectations_ErrorType: - return "MissingExpectations"; - case kWritingReferenceImage_ErrorType: - return "WritingReferenceImage"; - } - // control should never reach here - SkDEBUGFAIL("getErrorTypeName() called with unknown type"); - return "Unknown"; - } - - /** * A combination of 0 or more ErrorTypes. */ class ErrorCombination { @@ -114,5 +87,3 @@ namespace skiagm { // No errors at all. const static ErrorCombination kEmpty_ErrorCombination; } - -#endif // ifndef gm_error_DEFINED |