commit 0236cba8ba28f16a3eb99a3f4aedf40fe44cacad
author Joe Gregorio <jcgregorio@google.com> Mon Feb 13 13:55:17 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 13 19:46:09 2017 +0000
tree 3b45a335f8172f38e19bcde0edeac9c17e8ce9a8
parent c8f918004a86a11ac8518b56c6ce77f434205987

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>

tools/fiddle/fiddle_main.cpp

diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp
index aa08aaa..9353b62 100644
--- a/tools/fiddle/fiddle_main.cpp
+++ b/tools/fiddle/fiddle_main.cpp
@@ -192,14 +192,16 @@
         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;