OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 #ifndef gm_expectations_DEFINED | 7 #ifndef gm_expectations_DEFINED |
8 #define gm_expectations_DEFINED | 8 #define gm_expectations_DEFINED |
9 | 9 |
10 #include "gm.h" | 10 #include "gm.h" |
11 #include "SkBitmap.h" | 11 #include "SkBitmap.h" |
12 #include "SkBitmapHasher.h" | 12 #include "SkBitmapHasher.h" |
13 #include "SkData.h" | 13 #include "SkData.h" |
| 14 #include "SkJSONCPP.h" |
14 #include "SkOSFile.h" | 15 #include "SkOSFile.h" |
15 #include "SkRefCnt.h" | 16 #include "SkRefCnt.h" |
16 #include "SkStream.h" | 17 #include "SkStream.h" |
17 #include "SkTArray.h" | 18 #include "SkTArray.h" |
18 | 19 |
19 #ifdef SK_BUILD_FOR_WIN | |
20 // json includes xlocale which generates warning 4530 because we're compilin
g without | |
21 // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067 | |
22 #pragma warning(push) | |
23 #pragma warning(disable : 4530) | |
24 #endif | |
25 #include "json/reader.h" | |
26 #include "json/value.h" | |
27 #ifdef SK_BUILD_FOR_WIN | |
28 #pragma warning(pop) | |
29 #endif | |
30 | 20 |
31 namespace skiagm { | 21 namespace skiagm { |
32 | 22 |
33 void gm_fprintf(FILE *stream, const char format[], ...); | 23 void gm_fprintf(FILE *stream, const char format[], ...); |
34 | 24 |
35 Json::Value CreateJsonTree(Json::Value expectedResults, | 25 Json::Value CreateJsonTree(Json::Value expectedResults, |
36 Json::Value actualResultsFailed, | 26 Json::Value actualResultsFailed, |
37 Json::Value actualResultsFailureIgnored, | 27 Json::Value actualResultsFailureIgnored, |
38 Json::Value actualResultsNoComparison, | 28 Json::Value actualResultsNoComparison, |
39 Json::Value actualResultsSucceeded); | 29 Json::Value actualResultsSucceeded); |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 * Returns true if successful. | 264 * Returns true if successful. |
275 */ | 265 */ |
276 static bool Parse(const char *jsonPath, Json::Value *jsonRoot); | 266 static bool Parse(const char *jsonPath, Json::Value *jsonRoot); |
277 | 267 |
278 Json::Value fJsonRoot; | 268 Json::Value fJsonRoot; |
279 Json::Value fJsonExpectedResults; | 269 Json::Value fJsonExpectedResults; |
280 }; | 270 }; |
281 | 271 |
282 } | 272 } |
283 #endif | 273 #endif |
OLD | NEW |