Revert "GrContext::dump that produces JSON formatted output"

This reverts commit 175af0d01177fc6e5a81e979cd2ae3009c375940.

Reason for revert: Chrome doesn't know about portable format specifiers. Sigh.

Original change's description:
> GrContext::dump that produces JSON formatted output
> 
> Includes caps, GL strings, and extensions
> 
> Bug: skia:
> Change-Id: I1e8b3dd50fb68357f9de8ca6149cf65443d027ef
> Reviewed-on: https://skia-review.googlesource.com/32340
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

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

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

4 files changed, 3 insertions, 11 deletions

diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h
index 65df09251a..0990ecb105 100644
--- a/include/gpu/GrCaps.h
+++ b/include/gpu/GrCaps.h
@@ -16,7 +16,6 @@
 
 struct GrContextOptions;
 class GrRenderTargetProxy;
-class SkJSONWriter;
 
 /**
  * Represents the capabilities of a GrContext.
@@ -25,8 +24,7 @@ class GrCaps : public SkRefCnt {
 public:
     GrCaps(const GrContextOptions&);
 
-    void dumpJSON(SkJSONWriter*) const;
-
+    virtual SkString dump() const;
     const GrShaderCaps* shaderCaps() const { return fShaderCaps.get(); }
 
     bool npotTextureTileSupport() const { return fNPOTTextureTileSupport; }
@@ -240,7 +238,6 @@ protected:
 
 private:
     virtual void onApplyOptionsOverrides(const GrContextOptions&) {}
-    virtual void onDumpJSON(SkJSONWriter*) const {}
 
     bool fSuppressPrints : 1;
     bool fWireframeMode  : 1;
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 233a54f0b3..7a14a7d990 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -310,9 +310,6 @@ public:
     void dumpGpuStatsKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* values) const;
     void printGpuStats() const;
 
-    /** Returns a string with detailed information about the context & GPU, in JSON format. */
-    SkString dump() const;
-
     /** Specify the TextBlob cache limit. If the current cache exceeds this limit it will purge.
         this is for testing only */
     void setTextBlobCacheLimit_ForTesting(size_t bytes);
diff --git a/include/gpu/GrShaderCaps.h b/include/gpu/GrShaderCaps.h
index f2c6aaeccb..214d45e4c4 100644
--- a/include/gpu/GrShaderCaps.h
+++ b/include/gpu/GrShaderCaps.h
@@ -16,7 +16,6 @@ namespace SkSL {
     class ShaderCapsFactory;
 }
 struct GrContextOptions;
-class SkJSONWriter;
 
 class GrShaderCaps : public SkRefCnt {
 public:
@@ -69,7 +68,7 @@ public:
 
     GrShaderCaps(const GrContextOptions&);
 
-    void dumpJSON(SkJSONWriter*) const;
+    SkString dump() const;
 
     bool shaderDerivativeSupport() const { return fShaderDerivativeSupport; }
     bool geometryShaderSupport() const { return fGeometryShaderSupport; }
diff --git a/include/gpu/gl/GrGLExtensions.h b/include/gpu/gl/GrGLExtensions.h
index 0355ad292d..faf73fd36c 100644
--- a/include/gpu/gl/GrGLExtensions.h
+++ b/include/gpu/gl/GrGLExtensions.h
@@ -13,7 +13,6 @@
 #include "SkString.h"
 
 struct GrGLInterface;
-class SkJSONWriter;
 
 /**
  * This helper queries the current GL context for its extensions, remembers them, and can be
@@ -65,7 +64,7 @@ public:
 
     void reset() { fStrings->reset(); }
 
-    void dumpJSON(SkJSONWriter*) const;
+    void print(const char* sep = "\n") const;
 
 private:
     bool                                fInitialized;