Revert "Support single line objects and arrays"

This reverts commit 6a7d56fa0f7009be9df36774774f3c337d7c7760.

Reason for revert: Earlier commit needs to be reverted for Chrome roll.

Original change's description:
> Support single line objects and arrays
> 
> This is just a formatting nicety. The new caps dump has several large
> arrays of structs, and keeping each object on one line makes them much
> more readable. (It also limits the total length of the output, which
> helps when scanning through).
> 
> Example of the output, before and after this change:
> https://gist.github.com/brianosman/872f33be9af49031023b791e7db0b1fb
> 
> Bug: skia:
> Change-Id: I0fe0c2241b0c7f451b0837500e554d0491126d5e
> Reviewed-on: https://skia-review.googlesource.com/32820
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=bsalomon@google.com,brianosman@google.com

Change-Id: I2b05cf79ca4804e5944f2eb3e17fe4be4d5af290
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/32860
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

4 files changed, 14 insertions, 39 deletions

diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index a41845227d..00475e63ca 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -193,7 +193,7 @@ void GrCaps::dumpJSON(SkJSONWriter* writer) const {
 
     for (size_t i = 1; i < kGrPixelConfigCnt; ++i) {
         GrPixelConfig config = static_cast<GrPixelConfig>(i);
-        writer->beginObject(nullptr, false);
+        writer->beginObject();
         writer->appendString("name", pixel_config_name(config));
         writer->appendBool("renderable", this->isConfigRenderable(config, false));
         writer->appendBool("renderableMSAA", this->isConfigRenderable(config, true));
diff --git a/src/gpu/GrShaderCaps.cpp b/src/gpu/GrShaderCaps.cpp
index f73d218929..03495e98c3 100644
--- a/src/gpu/GrShaderCaps.cpp
+++ b/src/gpu/GrShaderCaps.cpp
@@ -117,7 +117,7 @@ void GrShaderCaps::dumpJSON(SkJSONWriter* writer) const {
         for (int p = 0; p < kGrSLPrecisionCount; ++p) {
             if (fFloatPrecisions[s][p].supported()) {
                 GrSLPrecision precision = static_cast<GrSLPrecision>(p);
-                writer->beginObject(nullptr, false);
+                writer->beginObject();
                 writer->appendString("precision", precision_to_string(precision));
                 writer->appendS32("log_low", fFloatPrecisions[s][p].fLogRangeLow);
                 writer->appendS32("log_high", fFloatPrecisions[s][p].fLogRangeHigh);
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 6e7a94972a..b90eefb19a 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -1258,7 +1258,7 @@ void GrGLCaps::onDumpJSON(SkJSONWriter* writer) const {
     writer->beginArray("Stencil Formats");
 
     for (int i = 0; i < fStencilFormats.count(); ++i) {
-        writer->beginObject(nullptr, false);
+        writer->beginObject();
         writer->appendS32("stencil bits", fStencilFormats[i].fStencilBits);
         writer->appendS32("total bits", fStencilFormats[i].fTotalBits);
         writer->endObject();
@@ -1339,7 +1339,7 @@ void GrGLCaps::onDumpJSON(SkJSONWriter* writer) const {
     writer->beginArray("configs");
 
     for (int i = 0; i < kGrPixelConfigCnt; ++i) {
-        writer->beginObject(nullptr, false);
+        writer->beginObject();
         writer->appendHexU32("flags", fConfigTable[i].fFlags);
         writer->appendHexU32("b_internal", fConfigTable[i].fFormats.fBaseInternalFormat);
         writer->appendHexU32("s_internal", fConfigTable[i].fFormats.fSizedInternalFormat);
diff --git a/src/utils/SkJSONWriter.h b/src/utils/SkJSONWriter.h
index 716bd60d9c..9ac28ebc47 100644
--- a/src/utils/SkJSONWriter.h
+++ b/src/utils/SkJSONWriter.h
@@ -54,14 +54,12 @@ public:
             , fMode(mode)
             , fState(State::kStart) {
         fScopeStack.push_back(Scope::kNone);
-        fNewlineStack.push_back(true);
     }
 
     ~SkJSONWriter() {
         this->flush();
         delete[] fBlock;
         SkASSERT(fScopeStack.count() == 1);
-        SkASSERT(fNewlineStack.count() == 1);
     }
 
     /**
@@ -88,7 +86,7 @@ public:
         if (State::kObjectValue == fState) {
             this->write(",", 1);
         }
-        this->separator(this->multiline());
+        this->newline();
         this->write("\"", 1);
         this->write(name, strlen(name));
         this->write("\":", 2);
@@ -98,17 +96,12 @@ public:
     /**
      *  Adds a new object. A name must be supplied when called between beginObject() and
      *  endObject(). Calls to beginObject() must be balanced by corresponding calls to endObject().
-     *  By default, objects are written out with one named value per line (when in kPretty mode).
-     *  This can be overridden for a particular object by passing false for multiline, this will
-     *  keep the entire object on a single line. This can help with readability in some situations.
-     *  In kFast mode, this parameter is ignored.
      */
-    void beginObject(const char* name = nullptr, bool multiline = true) {
+    void beginObject(const char* name = nullptr) {
         this->appendName(name);
         this->beginValue(true);
         this->write("{", 1);
         fScopeStack.push_back(Scope::kObject);
-        fNewlineStack.push_back(multiline);
         fState = State::kObjectBegin;
     }
 
@@ -119,10 +112,9 @@ public:
         SkASSERT(Scope::kObject == this->scope());
         SkASSERT(State::kObjectBegin == fState || State::kObjectValue == fState);
         bool emptyObject = State::kObjectBegin == fState;
-        bool wasMultiline = this->multiline();
         this->popScope();
         if (!emptyObject) {
-            this->separator(wasMultiline);
+            this->newline();
         }
         this->write("}", 1);
     }
@@ -130,17 +122,12 @@ public:
     /**
      *  Adds a new array. A name must be supplied when called between beginObject() and
      *  endObject(). Calls to beginArray() must be balanced by corresponding calls to endArray().
-     *  By default, arrays are written out with one value per line (when in kPretty mode).
-     *  This can be overridden for a particular array by passing false for multiline, this will
-     *  keep the entire array on a single line. This can help with readability in some situations.
-     *  In kFast mode, this parameter is ignored.
      */
-    void beginArray(const char* name = nullptr, bool multiline = true) {
+    void beginArray(const char* name = nullptr) {
         this->appendName(name);
         this->beginValue(true);
         this->write("[", 1);
         fScopeStack.push_back(Scope::kArray);
-        fNewlineStack.push_back(multiline);
         fState = State::kArrayBegin;
     }
 
@@ -151,10 +138,9 @@ public:
         SkASSERT(Scope::kArray == this->scope());
         SkASSERT(State::kArrayBegin == fState || State::kArrayValue == fState);
         bool emptyArray = State::kArrayBegin == fState;
-        bool wasMultiline = this->multiline();
         this->popScope();
         if (!emptyArray) {
-            this->separator(wasMultiline);
+            this->newline();
         }
         this->write("]", 1);
     }
@@ -273,7 +259,7 @@ private:
             this->write(",", 1);
         }
         if (Scope::kArray == this->scope()) {
-            this->separator(this->multiline());
+            this->newline();
         } else if (Scope::kObject == this->scope() && Mode::kPretty == fMode) {
             this->write(" ", 1);
         }
@@ -284,15 +270,11 @@ private:
         }
     }
 
-    void separator(bool multiline) {
+    void newline() {
         if (Mode::kPretty == fMode) {
-            if (multiline) {
-                this->write("\n", 1);
-                for (int i = 0; i < fScopeStack.count() - 1; ++i) {
-                    this->write("   ", 3);
-                }
-            } else {
-                this->write(" ", 1);
+            this->write("\n", 1);
+            for (int i = 0; i < fScopeStack.count() - 1; ++i) {
+                this->write("   ", 3);
             }
         }
     }
@@ -316,14 +298,8 @@ private:
         return fScopeStack.back();
     }
 
-    bool multiline() const {
-        SkASSERT(!fNewlineStack.empty());
-        return fNewlineStack.back();
-    }
-
     void popScope() {
         fScopeStack.pop_back();
-        fNewlineStack.pop_back();
         switch (this->scope()) {
             case Scope::kNone:
                 fState = State::kEnd;
@@ -348,7 +324,6 @@ private:
     Mode fMode;
     State fState;
     SkSTArray<16, Scope, true> fScopeStack;
-    SkSTArray<16, bool, true> fNewlineStack;
 };
 
 #endif