Devtools:[CustomFormatter] Allow object tags in headers

Source/devtools/front_end/components/CustomPreviewSection.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @param {!WebInspector.RemoteObject} object
  */
 WebInspector.CustomPreviewSection = function(object)
 {
     this._sectionElement = createElementWithClass("span", "custom-expandable-section");
     this._object = object;
     this._expanded = false;
     this._cachedContent = null;
     var customPreview = object.customPreview();
 
     try {
         var headerJSON = JSON.parse(customPreview.header);
     } catch (e) {
         WebInspector.console.error("Broken formatter: header is invalid json " + e);
         return;
     }
     this._header = this._renderJSONMLTag(headerJSON);
+    if (this._header.nodeType === Node.TEXT_NODE) {
+        WebInspector.console.error("Broken formatter: header should be tag. Text node aren't allowed as header!");

[pfeldman, 2015/04/23 09:50:52]

Header should be an element node.

[sergeyv, 2015/04/23 10:09:10]

Done.

+        return;
+    }
+
     if (customPreview.hasBody) {
         this._header.classList.add("custom-expandable-section-header");
         this._header.addEventListener("click", this._onClick.bind(this), false);
     }
 
     this._sectionElement.appendChild(this._header);
 }
 
 /**
  * @constructor
@@ skipping 111 matching lines @@
     /**
      * @param {!Node} parentElement
      * @param {!Array.<*>} jsonMLTags
      */
     _appendJsonMLTags: function(parentElement, jsonMLTags)
     {
         for (var i = 0; i < jsonMLTags.length; ++i)
             parentElement.appendChild(this._renderJSONMLTag(jsonMLTags[i]));
     },
 
-    _onClick: function()
+    /**
+     * @param {!Event} event
+     */
+    _onClick: function(event)
     {
+        event.consume(true);
         if (this._cachedContent)
             this._toggleExpand();
         else
             this._loadBody();
     },
 
     _toggleExpand: function()
     {
         this._expanded = !this._expanded;
         this._header.classList.toggle("expanded", this._expanded);
         this._cachedContent.classList.toggle("hidden", !this._expanded);
     },
 
     _loadBody: function()
     {
         /**
          * @suppressReceiverCheck
          * @suppressGlobalPropertiesCheck
          * @suppress {undefinedVars}
          * @this {Object}
          * @param {*=} formatter
+         * @param {*=} config
          */
-        function load(formatter)
+        function load(formatter, config)
         {
             /**
              * @param {*} jsonMLObject
              * @throws {string} error message
              */
             function substituteObjectTagsInCustomPreview(jsonMLObject)
             {
                 if (!jsonMLObject || (typeof jsonMLObject !== "object") || (typeof jsonMLObject.splice !== "function"))
                     return;
 
                 var obj = jsonMLObject.length;
                 if (!(typeof obj === "number" && obj >>> 0 === obj && (obj > 0 || 1 / obj > 0)))
                     return;
 
                 var startIndex = 1;
                 if (jsonMLObject[0] === "object") {
                     var attributes = jsonMLObject[1];
                     var originObject = attributes["object"];
+                    var config = attributes["config"];
                     if (typeof originObject === "undefined")
                         throw "Illegal format: obligatory attribute \"object\" isn't specified";
 
-                    jsonMLObject[1] = bindRemoteObject(originObject, false, false, null, false);
+                    jsonMLObject[1] = bindRemoteObject(originObject, false, false, null, false, config);
                     startIndex = 2;
                 }
                 for (var i = startIndex; i < jsonMLObject.length; ++i)
                     substituteObjectTagsInCustomPreview(jsonMLObject[i]);
             }
 
             try {
-                var body = formatter.body(this);
+                var body = formatter.body(this, config);
                 substituteObjectTagsInCustomPreview(body);
                 return body;
             } catch (e) {
                 console.error("Custom Formatter Failed: " + e);
                 return null;
             }
         }
 
         var customPreview = this._object.customPreview();
-        this._object.callFunctionJSON(load, [{objectId: customPreview.formatterObjectId}], onBodyLoaded.bind(this));
+        var args = [{objectId: customPreview.formatterObjectId}];
+        if (customPreview.configObjectId)
+            args.push({objectId: customPreview.configObjectId});
+        this._object.callFunctionJSON(load, args, onBodyLoaded.bind(this));
 
         /**
          * @param {*} bodyJsonML
          * @this {WebInspector.CustomPreviewSection}
          */
         function onBodyLoaded(bodyJsonML)
         {
             if (!bodyJsonML)
                 return;
 
             this._cachedContent = this._renderJSONMLTag(bodyJsonML);
             this._sectionElement.appendChild(this._cachedContent);
             this._toggleExpand();
         }
     }
 }