gm/gmmain.cpp - Issue 83863002: Add JSON output option to bench. - Code Review

Chromium Code Reviews

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

(1084)

My Issues | Starred Open | Closed | All

Unified Diff: gm/gmmain.cpp

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

« bench/ResultsWriter.h ('K') | « gm/gm_expectations.h ('k') | gyp/bench.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gm/gmmain.cpp

===================================================================

--- gm/gmmain.cpp (revision 12456)

+++ gm/gmmain.cpp (working copy)

@@ -30,6 +30,7 @@

#include "SkGraphics.h"

#include "SkImageDecoder.h"

#include "SkImageEncoder.h"

+#include "SkJSONCPP.h"

#include "SkOSFile.h"

#include "SkPDFRasterizer.h"

#include "SkPicture.h"

@@ -50,17 +51,6 @@

__SK_FORCE_IMAGE_DECODER_LINKING;

-#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/value.h"

-#ifdef SK_BUILD_FOR_WIN

- #pragma warning(pop)

-#endif

-

#if SK_SUPPORT_GPU

#include "GrContextFactory.h"

#include "SkGpuDevice.h"

« bench/ResultsWriter.h ('K') | « gm/gm_expectations.h ('k') | gyp/bench.gyp » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698