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

Unified Diff: gm/gm_expectations.cpp

Issue 15060008: Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/ChecksumBench.cpp ('k') | gyp/cityhash.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/gm_expectations.cpp
===================================================================
--- gm/gm_expectations.cpp (revision 9063)
+++ gm/gm_expectations.cpp (working copy)
@@ -16,18 +16,10 @@
const static char kJsonKey_ActualResults_FailureIgnored[]= "failure-ignored";
const static char kJsonKey_ActualResults_NoComparison[] = "no-comparison";
const static char kJsonKey_ActualResults_Succeeded[] = "succeeded";
-#ifdef BITMAPHASHER_USES_TRUNCATED_MD5
const static char kJsonKey_ActualResults_AnyStatus_BitmapHash[] = "bitmap-64bitMD5";
-#else
-const static char kJsonKey_ActualResults_AnyStatus_BitmapHash[] = "bitmap-cityhash";
-#endif
const static char kJsonKey_ExpectedResults[] = "expected-results";
-#ifdef BITMAPHASHER_USES_TRUNCATED_MD5
const static char kJsonKey_ExpectedResults_AllowedBitmapHashes[] = "allowed-bitmap-64bitMD5s";
-#else
-const static char kJsonKey_ExpectedResults_AllowedBitmapHashes[] = "allowed-bitmap-cityhashes";
-#endif
const static char kJsonKey_ExpectedResults_IgnoreFailure[] = "ignore-failure";
namespace skiagm {
« no previous file with comments | « bench/ChecksumBench.cpp ('k') | gyp/cityhash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698