| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "PictureRenderer.h" | 8 #include "PictureRenderer.h" |
| 9 #include "picture_utils.h" | 9 #include "picture_utils.h" |
| 10 #include "SamplePipeControllers.h" | 10 #include "SamplePipeControllers.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 enum { | 46 enum { |
| 47 kDefaultTileWidth = 256, | 47 kDefaultTileWidth = 256, |
| 48 kDefaultTileHeight = 256 | 48 kDefaultTileHeight = 256 |
| 49 }; | 49 }; |
| 50 | 50 |
| 51 /* TODO(epoger): These constants are already maintained in 2 other places: | 51 /* TODO(epoger): These constants are already maintained in 2 other places: |
| 52 * gm/gm_json.py and gm/gm_expectations.cpp. We shouldn't add yet a third place
. | 52 * gm/gm_json.py and gm/gm_expectations.cpp. We shouldn't add yet a third place
. |
| 53 * Figure out a way to share the definitions instead. | 53 * Figure out a way to share the definitions instead. |
| 54 */ | 54 */ |
| 55 const static char kJsonKey_ActualResults[] = "actual-results"; | 55 const static char kJsonKey_ActualResults[] = "actual-results"; |
| 56 const static char kJsonKey_ActualResults_Failed[] = "failed"; | |
| 57 const static char kJsonKey_ActualResults_FailureIgnored[]= "failure-ignored"; | |
| 58 const static char kJsonKey_ActualResults_NoComparison[] = "no-comparison"; | 56 const static char kJsonKey_ActualResults_NoComparison[] = "no-comparison"; |
| 59 const static char kJsonKey_ActualResults_Succeeded[] = "succeeded"; | |
| 60 const static char kJsonKey_ExpectedResults[] = "expected-results"; | |
| 61 const static char kJsonKey_ExpectedResults_AllowedDigests[] = "allowed-digests"; | |
| 62 const static char kJsonKey_ExpectedResults_IgnoreFailure[] = "ignore-failure"; | |
| 63 const static char kJsonKey_Hashtype_Bitmap_64bitMD5[] = "bitmap-64bitMD5"; | 57 const static char kJsonKey_Hashtype_Bitmap_64bitMD5[] = "bitmap-64bitMD5"; |
| 64 | 58 |
| 65 void ImageResultsSummary::add(const char *testName, const SkBitmap& bitmap) { | 59 void ImageResultsSummary::add(const char *testName, const SkBitmap& bitmap) { |
| 66 uint64_t hash; | 60 uint64_t hash; |
| 67 SkAssertResult(SkBitmapHasher::ComputeDigest(bitmap, &hash)); | 61 SkAssertResult(SkBitmapHasher::ComputeDigest(bitmap, &hash)); |
| 68 Json::Value jsonTypeValuePair; | 62 Json::Value jsonTypeValuePair; |
| 69 jsonTypeValuePair.append(Json::Value(kJsonKey_Hashtype_Bitmap_64bitMD5)); | 63 jsonTypeValuePair.append(Json::Value(kJsonKey_Hashtype_Bitmap_64bitMD5)); |
| 70 jsonTypeValuePair.append(Json::UInt64(hash)); | 64 jsonTypeValuePair.append(Json::UInt64(hash)); |
| 71 fActualResultsNoComparison[testName] = jsonTypeValuePair; | 65 fActualResultsNoComparison[testName] = jsonTypeValuePair; |
| 72 } | 66 } |
| (...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 952 virtual SkString getConfigNameInternal() SK_OVERRIDE { | 946 virtual SkString getConfigNameInternal() SK_OVERRIDE { |
| 953 return SkString("picture_clone"); | 947 return SkString("picture_clone"); |
| 954 } | 948 } |
| 955 }; | 949 }; |
| 956 | 950 |
| 957 PictureRenderer* CreatePictureCloneRenderer() { | 951 PictureRenderer* CreatePictureCloneRenderer() { |
| 958 return SkNEW(PictureCloneRenderer); | 952 return SkNEW(PictureCloneRenderer); |
| 959 } | 953 } |
| 960 | 954 |
| 961 } // namespace sk_tools | 955 } // namespace sk_tools |
| OLD | NEW |