[DevTools] Remove functionDetails from protocol.json

third_party/WebKit/Source/devtools/front_end/sdk/DebuggerModel.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 40 matching lines @@
     this._breakpointResolvedEventTarget = new WebInspector.Object();
 
     this._isPausing = false;
     WebInspector.moduleSetting("pauseOnExceptionEnabled").addChangeListener(this._pauseOnExceptionStateChanged, this);
     WebInspector.moduleSetting("pauseOnCaughtException").addChangeListener(this._pauseOnExceptionStateChanged, this);
     WebInspector.moduleSetting("enableAsyncStackTraces").addChangeListener(this.asyncStackTracesStateChanged, this);
 
     this.enableDebugger();
 }
 
-/** @typedef {{location: ?WebInspector.DebuggerModel.Location, sourceURL: ?string, functionName: string, scopeChain: (Array.<!DebuggerAgent.Scope>|null)}} */
+/** @typedef {{location: ?WebInspector.DebuggerModel.Location, sourceURL: ?string, functionName: string}} */
 WebInspector.DebuggerModel.FunctionDetails;
 
 /**
  * Keep these in sync with WebCore::V8Debugger
  *
  * @enum {string}
  */
 WebInspector.DebuggerModel.PauseOnExceptionsState = {
     DontPauseOnExceptions : "none",
     PauseOnAllExceptions : "all",
@@ skipping 581 matching lines @@
 
             if (objectGroup === "console")
                 this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ConsoleCommandEvaluatedInSelectedCallFrame);
         }
 
         this.selectedCallFrame().evaluate(code, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, didEvaluate.bind(this));
     },
 
     /**
      * @param {!WebInspector.RemoteObject} remoteObject
-     * @param {function(?WebInspector.DebuggerModel.FunctionDetails)} callback
+     * @return {!Promise<?WebInspector.DebuggerModel.FunctionDetails>}
      */
-    functionDetails: function(remoteObject, callback)
+    functionDetailsPromise: function(remoteObject)
     {
-        this._agent.getFunctionDetails(remoteObject.objectId, didGetDetails.bind(this));
+        return remoteObject.getAllPropertiesPromise(/* accessorPropertiesOnly */false).then(buildDetails.bind(this));
 
         /**
-         * @param {?Protocol.Error} error
-         * @param {!DebuggerAgent.FunctionDetails} response
-         * @this {WebInspector.DebuggerModel}
+         * @param {!{properties: ?Array.<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array.<!WebInspector.RemoteObjectProperty>}} response
+         * @return {?WebInspector.DebuggerModel.FunctionDetails}
+         * @this {!WebInspector.DebuggerModel}
          */
-        function didGetDetails(error, response)
+        function buildDetails(response)
         {
-            if (error) {
-                callback(null);
-                return;
+            if (!response || !response.internalProperties)
+                return null;
+            var location = null;
+            var functionName = null;
+            for (var prop of response.internalProperties) {
+                if (prop.name === "[[FunctionLocation]]")
+                    location = prop.value;
             }
-            var location = response.location;
-            var script = this.scriptForId(location.scriptId);
-            var rawLocation = script ? this.createRawLocation(script, location.lineNumber, location.columnNumber || 0) : null;
-            var sourceURL = script ? script.contentURL() : null;
-            callback({location: rawLocation, sourceURL: sourceURL, functionName: response.functionName, scopeChain: response.scopeChain || null});
+            if (!functionName && response.properties) {

[dgozman, 2016/07/09 01:47:29]

functionName is always null here.

[kozy, 2016/07/11 17:50:39]

Done.

+                for (var prop of response.properties) {
+                    if (prop.name === "name" && prop.value && prop.value.type === "string")
+                        functionName = prop.value;
+                    if (prop.name === "displayName" && prop.value && prop.value.type === "string") {
+                        functionName = prop.value;
+                        break;
+                    }
+                }
+            }
+            var debuggerLocation = null;
+            if (location)
+                debuggerLocation = this.createRawLocationByScriptId(location.value.scriptId, location.value.lineNumber, location.value.columnNumber);
+            return { location: debuggerLocation, sourceURL: null, functionName: functionName ? functionName.value : "" };

[dgozman, 2016/07/09 01:47:29]

Why null sourceURL? Either remove it or get it from the script.

[kozy, 2016/07/11 17:50:39]

Done.

         }
     },
 
     /**
      * @param {number} scopeNumber
      * @param {string} variableName
      * @param {!RuntimeAgent.CallArgument} newValue
      * @param {string} callFrameId
      * @param {function(string=)=} callback
      */
@@ skipping 589 matching lines @@
 /**
  * @param {?WebInspector.Target} target
  * @return {?WebInspector.DebuggerModel}
  */
 WebInspector.DebuggerModel.fromTarget = function(target)
 {
     if (!target || !target.hasJSContext())
         return null;
     return /** @type {?WebInspector.DebuggerModel} */ (target.model(WebInspector.DebuggerModel));
 }