DevTools: Build function details' raw location in DebuggerModel

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 45 matching lines @@
 
     WebInspector.settings.enableAsyncStackTraces.addChangeListener(this._asyncStackTracesStateChanged, this);
     target.profilingLock.addEventListener(WebInspector.Lock.Events.StateChanged, this._profilingStateChanged, this);
 
     this.enableDebugger();
 
     WebInspector.settings.skipStackFramesPattern.addChangeListener(this._applySkipStackFrameSettings, this);
     this._applySkipStackFrameSettings();
 }
 
+/** @typedef {{location: ?WebInspector.DebuggerModel.Location, functionName: string, scopeChain: (Array.<!DebuggerAgent.Scope>|null)}} */
+WebInspector.DebuggerModel.FunctionDetails;
+
 /**
  * Keep these in sync with WebCore::ScriptDebugServer
  *
  * @enum {string}
  */
 WebInspector.DebuggerModel.PauseOnExceptionsState = {
     DontPauseOnExceptions : "none",
     PauseOnAllExceptions : "all",
     PauseOnUncaughtExceptions: "uncaught"
 };
@@ skipping 599 matching lines @@
      * @param {function(!WebInspector.UILocation):(boolean|undefined)} updateDelegate
      * @return {!WebInspector.Script.Location}
      */
     createLiveLocation: function(rawLocation, updateDelegate)
     {
         var script = this._scripts[rawLocation.scriptId];
         return script.createLiveLocation(rawLocation, updateDelegate);
     },
 
     /**
-     * @param {!WebInspector.DebuggerModel.Location|!DebuggerAgent.Location} rawLocation
+     * @param {!WebInspector.DebuggerModel.Location} rawLocation
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
         var script = this._scripts[rawLocation.scriptId];
         if (!script)
             return null;
         return script.rawLocationToUILocation(rawLocation.lineNumber, rawLocation.columnNumber);
     },
 
@@ skipping 14 matching lines @@
 
     _applySkipStackFrameSettings: function()
     {
         if (!WebInspector.experimentsSettings.frameworksDebuggingSupport.isEnabled())
             return;
         this._agent.skipStackFrames(WebInspector.settings.skipStackFramesPattern.get());
     },
 
     /**
      * @param {!WebInspector.RemoteObject} remoteObject
-     * @param {function(?DebuggerAgent.FunctionDetails)} callback
+     * @param {function(?WebInspector.DebuggerModel.FunctionDetails)} callback
      */
     functionDetails: function(remoteObject, callback)
     {
-        this._agent.getFunctionDetails(remoteObject.objectId, didGetDetails);
+        this._agent.getFunctionDetails(remoteObject.objectId, didGetDetails.bind(this));
 
         /**
          * @param {?Protocol.Error} error
          * @param {!DebuggerAgent.FunctionDetails} response
+         * @this {WebInspector.DebuggerModel}
          */
         function didGetDetails(error, response)
         {
             if (error) {
                 console.error(error);
                 callback(null);
                 return;
             }
-            callback(response);
+            var location = response.location;
+            var script = this.scriptForId(location.scriptId);
+            var rawLocation = script ? this.createRawLocation(script, location.lineNumber + 1, location.columnNumber + 1) : null;
+            callback({location: rawLocation, functionName: response.functionName, scopeChain: response.scopeChain || null});
         }
     },
 
     /**
      * @param {!DebuggerAgent.BreakpointId} breakpointId
      * @param {function(!WebInspector.Event)} listener
      * @param {!Object=} thisObject
      */
     addBreakpointListener: function(breakpointId, listener, thisObject)
     {
@@ skipping 448 matching lines @@
             this.asyncStackTrace.dispose();
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }
 
 /**
  * @type {!WebInspector.DebuggerModel}
  */
 WebInspector.debuggerModel;