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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gm/gm_expectations.h

Issue 83863002: Add JSON output option to bench. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: %040s is not the same as %40s, at least on Mac. Created 7 years 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
« bench/ResultsWriter.h ('K') | « bench/benchmain.cpp ('k') | gm/gmmain.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/gm_expectations.h
===================================================================
--- gm/gm_expectations.h (revision 12456)
+++ gm/gm_expectations.h (working copy)
@@ -11,22 +11,12 @@
#include "SkBitmap.h"
#include "SkBitmapHasher.h"
#include "SkData.h"
+#include "SkJSONCPP.h"
#include "SkOSFile.h"
#include "SkRefCnt.h"
#include "SkStream.h"
#include "SkTArray.h"
-#ifdef SK_BUILD_FOR_WIN
- // json includes xlocale which generates warning 4530 because we're compiling without
- // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067
- #pragma warning(push)
- #pragma warning(disable : 4530)
-#endif
-#include "json/reader.h"
-#include "json/value.h"
-#ifdef SK_BUILD_FOR_WIN
- #pragma warning(pop)
-#endif
namespace skiagm {
« bench/ResultsWriter.h ('K') | « bench/benchmain.cpp ('k') | gm/gmmain.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698