[DevTools] Remove functionDetails from protocol.json

third_party/WebKit/Source/devtools/front_end/components/ObjectPropertiesSection.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 573 matching lines @@
         for (var i = 0; i < internalProperties.length; i++) {
             internalProperties[i].parentObject = value;
             var treeElement = new WebInspector.ObjectPropertyTreeElement(internalProperties[i], linkifier);
             if (internalProperties[i].name === "[[Entries]]") {
                 treeElement.setExpandable(true);
                 treeElement.expand();
             }
             treeNode.appendChild(treeElement);
         }
     }
-    if (value && value.type === "function") {
-        // Whether function has TargetFunction internal property.
-        // This is a simple way to tell that the function is actually a bound function (we are not told).
-        // Bound function never has inner scope and doesn't need corresponding UI node.
-        var hasTargetFunction = false;
-
-        if (internalProperties) {
-            for (var i = 0; i < internalProperties.length; i++) {
-                if (internalProperties[i].name === "[[TargetFunction]]") {
-                    hasTargetFunction = true;
-                    break;
-                }
-            }
-        }
-        if (!hasTargetFunction)
-            treeNode.appendChild(new WebInspector.FunctionScopeMainTreeElement(value, linkifier));
-    }
     WebInspector.ObjectPropertyTreeElement._appendEmptyPlaceholderIfNeeded(treeNode, emptyPlaceholder);
 }
 
 /**
  * @param {!TreeElement} treeNode
  * @param {?string=} emptyPlaceholder
  */
 WebInspector.ObjectPropertyTreeElement._appendEmptyPlaceholderIfNeeded = function(treeNode, emptyPlaceholder)
 {
     if (treeNode.childCount())
@@ skipping 26 matching lines @@
         event.consume();
         object.getProperty(propertyPath, callback);
     }
 
     return rootElement;
 }
 
 /**
  * @constructor
  * @extends {TreeElement}
- * @param {!WebInspector.RemoteObject} remoteObject
- * @param {!WebInspector.Linkifier=} linkifier
- */
-WebInspector.FunctionScopeMainTreeElement = function(remoteObject, linkifier)
-{
-    TreeElement.call(this, "<function scope>", true);
-    this.toggleOnClick = true;
-    this.selectable = false;
-    this._remoteObject = remoteObject;
-    this._linkifier = linkifier;
-}
-
-WebInspector.FunctionScopeMainTreeElement.prototype = {
-    onpopulate: function()
-    {
-        /**
-         * @param {?WebInspector.DebuggerModel.FunctionDetails} response
-         * @this {WebInspector.FunctionScopeMainTreeElement}
-         */
-        function didGetDetails(response)
-        {
-            if (!response)
-                return;
-            this.removeChildren();
-
-            var scopeChain = response.scopeChain || [];
-            for (var i = 0; i < scopeChain.length; ++i) {
-                var scope = scopeChain[i];
-                var title = null;
-                var isTrueObject = false;
-
-                switch (scope.type) {
-                case DebuggerAgent.ScopeType.Local:
-                    // Not really expecting this scope type here.
-                    title = WebInspector.UIString("Local");
-                    break;
-                case DebuggerAgent.ScopeType.Closure:
-                    title = WebInspector.UIString("Closure");
-                    break;
-                case DebuggerAgent.ScopeType.Catch:
-                    title = WebInspector.UIString("Catch");
-                    break;
-                case DebuggerAgent.ScopeType.Block:
-                    title = WebInspector.UIString("Block");
-                    break;
-                case DebuggerAgent.ScopeType.Script:
-                    title = WebInspector.UIString("Script");
-                    break;
-                case DebuggerAgent.ScopeType.With:
-                    title = WebInspector.UIString("With Block");
-                    isTrueObject = true;
-                    break;
-                case DebuggerAgent.ScopeType.Global:
-                    title = WebInspector.UIString("Global");
-                    isTrueObject = true;
-                    break;
-                default:
-                    console.error("Unknown scope type: " + scope.type);
-                    continue;
-                }
-
-                var runtimeModel = this._remoteObject.target().runtimeModel;
-                if (isTrueObject) {
-                    var remoteObject = runtimeModel.createRemoteObject(scope.object);
-                    var property = new WebInspector.RemoteObjectProperty(title, remoteObject);
-                    property.writable = false;
-                    property.parentObject = null;
-                    this.appendChild(new WebInspector.ObjectPropertyTreeElement(property, this._linkifier));
-                } else {
-                    var scopeRef = new WebInspector.ScopeRef(i, undefined);
-                    var remoteObject = runtimeModel.createScopeRemoteObject(scope.object, scopeRef);
-                    var scopeTreeElement = new WebInspector.ScopeTreeElement(title, remoteObject);
-                    this.appendChild(scopeTreeElement);
-                }
-            }
-
-            WebInspector.ObjectPropertyTreeElement._appendEmptyPlaceholderIfNeeded(this, WebInspector.UIString("No Scopes"));
-        }
-
-        this._remoteObject.functionDetails(didGetDetails.bind(this));
-    },
-
-    __proto__: TreeElement.prototype
-}
-
-/**
- * @constructor
- * @extends {TreeElement}
- * @param {string} title
- * @param {!WebInspector.RemoteObject} remoteObject
- */
-WebInspector.ScopeTreeElement = function(title, remoteObject)
-{
-    TreeElement.call(this, title, true);
-    this.toggleOnClick = true;
-    this.selectable = false;
-    this._remoteObject = remoteObject;
-}
-
-WebInspector.ScopeTreeElement.prototype = {
-    onpopulate: function()
-    {
-        WebInspector.ObjectPropertyTreeElement._populate(this, this._remoteObject, false);
-    },
-
-    __proto__: TreeElement.prototype
-}
-
-/**
- * @constructor
- * @extends {TreeElement}
  * @param {!WebInspector.RemoteObject} object
  * @param {number} fromIndex
  * @param {number} toIndex
  * @param {number} propertyCount
  * @param {!WebInspector.Linkifier=} linkifier
  */
 WebInspector.ArrayGroupingTreeElement = function(object, fromIndex, toIndex, propertyCount, linkifier)
 {
     TreeElement.call(this, String.sprintf("[%d \u2026 %d]", fromIndex, toIndex), true);
     this.toggleOnClick = true;
@@ skipping 407 matching lines @@
 
     if (type === "object" && subtype === "node" && description) {
         WebInspector.DOMPresentationUtils.createSpansForNodeTitle(valueElement, description);
         valueElement.addEventListener("click", mouseClick, false);
         valueElement.addEventListener("mousemove", mouseMove, false);
         valueElement.addEventListener("mouseleave", mouseLeave, false);
     } else {
         valueElement.title = description || "";
     }
 
-    if (type === "object" && subtype === "internal#location" && linkifier)
-        return linkifier.linkifyScriptLocation(value.target(), value.value.scriptId, "", value.value.lineNumber, value.value.columnNumber);
+    if (type === "object" && subtype === "internal#location") {
+        var rawLocation = value.debuggerModel().createRawLocationByScriptId(value.value.scriptId, value.value.lineNumber, value.value.columnNumber);
+        if (rawLocation && linkifier)
+            return linkifier.linkifyRawLocation(rawLocation, "");
+        else
+            valueElement.textContent = "<unknown>";
+    }
 
     function mouseMove()
     {
         WebInspector.DOMModel.highlightObjectAsDOMNode(value);
     }
 
     function mouseLeave()
     {
         WebInspector.DOMModel.hideDOMNodeHighlight();
     }
@@ skipping 11 matching lines @@
 }
 
 /**
  * @param {!WebInspector.RemoteObject} func
  * @param {!Element} element
  * @param {boolean} linkify
  * @param {boolean=} includePreview
  */
 WebInspector.ObjectPropertiesSection.formatObjectAsFunction = function(func, element, linkify, includePreview)
 {
-    func.functionDetails(didGetDetails);
+    func.debuggerModel().functionDetailsPromise(func).then(didGetDetails);
 
     /**
      * @param {?WebInspector.DebuggerModel.FunctionDetails} response
      */
     function didGetDetails(response)
     {
         if (!response) {
             var valueText = WebInspector.ObjectPropertiesSection.valueTextForFunctionDescription(func.description);
             element.createTextChild(valueText);
             return;
@@ skipping 145 matching lines @@
 
             result = currentName + (result ? "." + result : "");
             current = current.parent;
         }
         var treeOutlineId = treeElement.treeOutline[WebInspector.ObjectPropertiesSectionExpandController._treeOutlineId];
         result = treeOutlineId + (result ? ":" + result : "");
         treeElement[WebInspector.ObjectPropertiesSectionExpandController._cachedPathSymbol] = result;
         return result;
     }
 }