[DevTools] JSONView parsing smarter

[DevTools] JSONView parsing smarter

[Copy of  issue 1838873002 due to bug with bad patch.]

JSONView should now be a little more smart in the way it parses data.
Users may send many different kinds of JSON and it should still display
it to the users. If the JSON is much to far gone to be considered JSON
the parser will exit (for example if the user sends things like:
{a:5*5} it will not parse it. ie: no arithmics... static content only)

BUG=598390
R=lushnikov

Committed: https://crrev.com/b3c4942acdf45b1fafbae6955dd544026c2913dd
Cr-Commit-Position: refs/heads/master@{#389321}

[allada, 2016-04-22 01:13:20]

PTL

[lushnikov, 2016-04-22 01:13:55]

lgtm, thanks!

[allada, 2016-04-22 01:14:42]

The CQ bit was checked by allada@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-22 01:15:03]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1912973002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1912973002/1

[commit-bot: I haz the power, 2016-04-22 01:17:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-22 01:17:11]

Dry run: Try jobs failed on following builders:
  ios_dbg_simulator_gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_gn...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)

[allada, 2016-04-22 16:48:52]

The CQ bit was checked by allada@chromium.org

[allada, 2016-04-22 16:48:53]

The patchset sent to the CQ was uploaded after l-g-t-m from
lushnikov@chromium.org
Link to the patchset: https://codereview.chromium.org/1912973002/#ps20001
(title: " ")

[commit-bot: I haz the power, 2016-04-22 16:49:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1912973002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1912973002/20001

[commit-bot: I haz the power, 2016-04-22 16:51:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-22 16:51:46]

Try jobs failed on following builders:
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)

[allada, 2016-04-22 18:08:36]

The CQ bit was checked by allada@chromium.org

[allada, 2016-04-22 18:08:37]

The patchset sent to the CQ was uploaded after l-g-t-m from
lushnikov@chromium.org
Link to the patchset: https://codereview.chromium.org/1912973002/#ps40001
(title: " ")

[commit-bot: I haz the power, 2016-04-22 18:09:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1912973002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1912973002/40001

[commit-bot: I haz the power, 2016-04-22 19:59:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-22 19:59:46]

Failed to apply patch for
third_party/WebKit/Source/devtools/front_end/network/JSONView.js:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Source/devtools/front_end/network/JSONView.js:40
  Falling back to three-way merge...
  Applied patch to
'third_party/WebKit/Source/devtools/front_end/network/JSONView.js' with
conflicts.
  U third_party/WebKit/Source/devtools/front_end/network/JSONView.js

Patch:       third_party/WebKit/Source/devtools/front_end/network/JSONView.js
Index: third_party/WebKit/Source/devtools/front_end/network/JSONView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/JSONView.js
b/third_party/WebKit/Source/devtools/front_end/network/JSONView.js
index
1ad28043666594939e5b3c36d348e7e4ac007530..20f9c5c9f6119dbb3a6ca78d7cac365e74b2332a
100644
--- a/third_party/WebKit/Source/devtools/front_end/network/JSONView.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/JSONView.js
@@ -40,100 +40,47 @@ WebInspector.JSONView = function(parsedJSON)
     this.element.classList.add("json-view");
 }
 
-// "false", "true", "null", ",", "{", "}", "[", "]", number, double-quoted
string.
-WebInspector.JSONView._jsonToken = new
RegExp('(?:false|true|null|[/*&\\|;=\\(\\),\\{\\}\\[\\]]|(?:-?\\b(?:0|[1-9][0-9]*)(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\\b)|(?:\"(?:[^\\0-\\x08\\x0a-\\x1f\"\\\\]|\\\\(?:[\"/\\\\bfnrt]|u[0-9A-Fa-f]{4}))*\"))',
'g');
-
-// Escaped unicode char.
-WebInspector.JSONView._escapedUnicode = new RegExp('\\\\(?:([^u])|u(.{4}))',
'g');
-
-// Map from escaped char to its literal value.
-WebInspector.JSONView._standardEscapes = {'"': '"', '/': '/', '\\': '\\', 'b':
'\b', 'f': '\f', 'n': '\n', 'r': '\r', 't': '\t'};
-
-/**
- * @param {string} full
- * @param {string} standard
- * @param {string} unicode
- * @return {string}
- */
-WebInspector.JSONView._unescape = function(full, standard, unicode)
-{
-    return standard ? WebInspector.JSONView._standardEscapes[standard] :
String.fromCharCode(parseInt(unicode, 16));
-}
-
-/**
- * @param {string} text
- * @return {string}
- */
-WebInspector.JSONView._unescapeString = function(text)
-{
-    return text.indexOf("\\") === -1 ? text :
text.replace(WebInspector.JSONView._escapedUnicode,
WebInspector.JSONView._unescape);
-}
-
 /**
- * @return {*}
+ * @param {?string} text
+ * @return {!Promise<?WebInspector.ParsedJSON>}
  */
-WebInspector.JSONView._buildObjectFromJSON = function(text)
+WebInspector.JSONView.parseJSON = function(text)
 {
-    var regExp = WebInspector.JSONView._jsonToken;
-    regExp.lastIndex = 0;
-    var result = [];
-    var tip = result;
-    var stack = [];
-    var key = undefined;
-    var token = undefined;
-    var lastToken = undefined;
-    while (true) {
-        var match = regExp.exec(text);
-        if (match === null)
-            break;
-        lastToken = token;
-        token = match[0];
-        var code = token.charCodeAt(0);
-        if ((code === 0x5b) || (code === 0x7b)) { // [ or {
-            var newTip = (code === 0x5b) ? [] : {};
-            tip[key || tip.length] = newTip;
-            stack.push(tip);
-            tip = newTip;
-        } else if ((code === 0x5d) || (code === 0x7d)) { // ] or }
-            tip = stack.pop();
-            if (!tip)
-                break;
-        } else if (code === 0x2C) { // ,
-            if (Array.isArray(tip) && (lastToken === undefined || lastToken ===
"[" || lastToken === ","))
-                tip[tip.length] = undefined;
-        } else if (code === 0x22) { // "
-            token = WebInspector.JSONView._unescapeString(token.substring(1,
token.length - 1));
-            if (!key) {
-                if (Array.isArray(tip)) {
-                  key = tip.length;
-                } else {
-                    key = token || "";
-                    continue;
-                }
+    var returnObj = null;
+    if (text)
+        returnObj = WebInspector.JSONView._extractJSON(/** @type {string} */
(text));
+    if (!returnObj)
+        return Promise.resolve(/** @type {?WebInspector.ParsedJSON} */ (null));
+    return new Promise(runParser);
+
+    /**
+     * @param {function(*)} success
+     */
+    function runParser(success) {
+        var worker = new WorkerRuntime.Worker("formatter_worker");
+        worker.onmessage =  /** @type function(!MessageEvent) */
(handleReturnedJSON);
+        worker.postMessage({method: "relaxedJSONParser", params:{content:
returnObj.data}});
+
+        /**
+         * @param {!MessageEvent} event
+         */
+        function handleReturnedJSON(event) {
+            worker.terminate();
+            if (!event.data) {
+                success(null);
+                return;
             }
-            tip[key] = token;
-        } else if (code === 0x66) { // f
-            tip[key || tip.length] = false;
-        } else if (code === 0x6e) { // n
-            tip[key || tip.length] = null;
-        } else if (code === 0x74) { // t
-            tip[key || tip.length] = true;
-        } else if (code === 0x2f || code === 0x2a || code === 0x26 || code ===
0x7c || code === 0x3b || code === 0x3d || code === 0x28 || code === 0x29) { //
/*&|;=()
-            // Looks like JavaScript
-            throw "Invalid JSON";
-        } else { // sign or digit
-            tip[key || tip.length] = +(token);
+            returnObj.data = event.data;
+            success(returnObj);
         }
-        key = undefined;
     }
-    return (result.length > 1) ? result : result[0];
 }
 
 /**
  * @param {string} text
  * @return {?WebInspector.ParsedJSON}
  */
-WebInspector.JSONView.parseJSON = function(text)
+WebInspector.JSONView._extractJSON = function(text)
 {
     // Do not treat HTML as JSON.
     if (text.startsWith("<"))
@@ -154,11 +101,7 @@ WebInspector.JSONView.parseJSON = function(text)
     if (suffix.trim().length && !(suffix.trim().startsWith(")") &&
prefix.trim().endsWith("(")))
         return null;
 
-    try {
-        return new
WebInspector.ParsedJSON(WebInspector.JSONView._buildObjectFromJSON(text),
prefix, suffix);
-    } catch (e) {
-        return null;
-    }
+    return new WebInspector.ParsedJSON(text, prefix, suffix);
 }
 
 /**
@@ -192,8 +135,8 @@ WebInspector.JSONView.prototype = {
         var obj =
WebInspector.RemoteObject.fromLocalObject(this._parsedJSON.data);
         var title = this._parsedJSON.prefix + obj.description +
this._parsedJSON.suffix;
         var section = new WebInspector.ObjectPropertiesSection(obj, title);
+        section.setEditable(false);
         section.expand();
-        section.editable = false;
         this.element.appendChild(section.element);
     },

[allada, 2016-04-22 22:26:01]

Patchset #4 (id:60001) has been deleted

[allada, 2016-04-22 22:26:55]

The CQ bit was checked by allada@chromium.org

[allada, 2016-04-22 22:26:56]

The patchset sent to the CQ was uploaded after l-g-t-m from
lushnikov@chromium.org
Link to the patchset: https://codereview.chromium.org/1912973002/#ps80001
(title: " ")

[commit-bot: I haz the power, 2016-04-22 22:27:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1912973002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1912973002/80001

[commit-bot: I haz the power, 2016-04-23 00:16:01]

Committed patchset #4 (id:80001)

[commit-bot: I haz the power, 2016-04-23 00:16:59]

Description was changed from

==========
[DevTools] JSONView parsing smarter

[Copy of  issue 1838873002 due to bug with bad patch.]

JSONView should now be a little more smart in the way it parses data.
Users may send many different kinds of JSON and it should still display
it to the users. If the JSON is much to far gone to be considered JSON
the parser will exit (for example if the user sends things like:
{a:5*5} it will not parse it. ie: no arithmics... static content only)

BUG=598390
R=lushnikov
==========

to

==========
[DevTools] JSONView parsing smarter

[Copy of  issue 1838873002 due to bug with bad patch.]

JSONView should now be a little more smart in the way it parses data.
Users may send many different kinds of JSON and it should still display
it to the users. If the JSON is much to far gone to be considered JSON
the parser will exit (for example if the user sends things like:
{a:5*5} it will not parse it. ie: no arithmics... static content only)

BUG=598390
R=lushnikov

Committed: https://crrev.com/b3c4942acdf45b1fafbae6955dd544026c2913dd
Cr-Commit-Position: refs/heads/master@{#389321}
==========

[commit-bot: I haz the power, 2016-04-23 00:17:00]

Patchset 4 (id:??) landed as
https://crrev.com/b3c4942acdf45b1fafbae6955dd544026c2913dd
Cr-Commit-Position: refs/heads/master@{#389321}