gm/gm_expectations.h - Issue 83863002: Add JSON output option to bench.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: auto cleanup Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gm/gm_expectations.h

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

--- gm/gm_expectations.h (revision 12359)

+++ 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/benchmain.cpp ('K') | « bench/benchmain.cpp ('k') | gm/gmmain.cpp » ('j') | no next file with comments »