[DevTools] Pass bindRemoteObject function to Custom Formatter directly

third_party/WebKit/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)
 {
@@ skipping 166 matching lines @@
         this._cachedContent.classList.toggle("hidden", !this._expanded);
     },
 
     _loadBody: function()
     {
         /**
          * @suppressReceiverCheck
          * @suppressGlobalPropertiesCheck
          * @suppress {undefinedVars}
          * @this {Object}
+         * @param {function(!Object, *):*} bindRemoteObject
          * @param {*=} formatter
          * @param {*=} config
          */
-        function load(formatter, config)
+        function load(bindRemoteObject, 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, config);
+                    jsonMLObject[1] = bindRemoteObject(originObject, config);
                     startIndex = 2;
                 }
                 for (var i = startIndex; i < jsonMLObject.length; ++i)
                     substituteObjectTagsInCustomPreview(jsonMLObject[i]);
             }
 
             try {
                 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();
-        var args = [{objectId: customPreview.formatterObjectId}];
+        var args = [{objectId: customPreview.bindRemoteObjectFunctionId}, {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();
         }
     }
 }