aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/fiddle
diff options
context:
space:
mode:
authorGravatar Joe Gregorio <jcgregorio@google.com>2017-02-13 13:55:17 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-13 19:46:09 +0000
commit0236cba8ba28f16a3eb99a3f4aedf40fe44cacad (patch)
tree3b45a335f8172f38e19bcde0edeac9c17e8ce9a8 /tools/fiddle
parentc8f918004a86a11ac8518b56c6ce77f434205987 (diff)
fiddle: Fix JSON output logic.
BUG=skia: Change-Id: Ia17b8328f692881282be15afa5e7f661ddc83318 Reviewed-on: https://skia-review.googlesource.com/8388 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Diffstat (limited to 'tools/fiddle')
-rw-r--r--tools/fiddle/fiddle_main.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp
index aa08aaa368..9353b622fa 100644
--- a/tools/fiddle/fiddle_main.cpp
+++ b/tools/fiddle/fiddle_main.cpp
@@ -192,14 +192,16 @@ int main() {
picture->serialize(&skpStream);
skpData = skpStream.detachAsData();
}
- bool textOnly = options.textOnly;
printf("{\n");
- dump_output(rasterData, "Raster", !gpuData && !pdfData && !skpData && !textOnly);
- dump_output(gpuData, "Gpu", !pdfData && !skpData && !textOnly);
- dump_output(pdfData, "Pdf", !skpData && !textOnly);
- dump_output(skpData, "Skp", !textOnly);
- dump_text(textoutput, "Text");
+ if (!options.textOnly) {
+ dump_output(rasterData, "Raster", !gpuData && !pdfData && !skpData);
+ dump_output(gpuData, "Gpu", !pdfData && !skpData);
+ dump_output(pdfData, "Pdf", !skpData);
+ dump_output(skpData, "Skp");
+ } else {
+ dump_text(textoutput, "Text");
+ }
printf("}\n");
return 0;