[DevTools] Move getFunctionDetails to native

third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 432 matching lines @@
             if (!("enumerable" in descriptor))
                 descriptor.enumerable = false;
             if ("symbol" in descriptor)
                 descriptor.symbol = this._wrapObject(descriptor.symbol, objectGroupName);
             push(descriptors, descriptor);
         }
         return descriptors;
     },
 
     /**
-     * @param {string} functionId
-     * @return {!DebuggerAgent.FunctionDetails|string}
-     */
-    getFunctionDetails: function(functionId)
-    {
-        var parsedFunctionId = this._parseObjectId(functionId);
-        var func = this._objectForId(parsedFunctionId);
-        if (typeof func !== "function")
-            return "Cannot resolve function by id.";
-        var details = nullifyObjectProto(/** @type {!DebuggerAgent.FunctionDetails} */ (InjectedScriptHost.functionDetails(func)));
-        if ("rawScopes" in details) {
-            var objectGroupName = InjectedScriptHost.idToObjectGroupName(parsedFunctionId.id);
-            var rawScopes = details["rawScopes"];
-            delete details["rawScopes"];
-            var scopes = [];
-            for (var i = 0; i < rawScopes.length; ++i)
-                scopes[i] = InjectedScript.CallFrameProxy._createScopeJson(rawScopes[i].type, rawScopes[i].name, rawScopes[i].object, objectGroupName);
-            details.scopeChain = scopes;
-        }
-        return details;
-    },
-
-    /**
      * @param {string} objectId
      * @return {!Array.<!Object>|string}
      */
     getCollectionEntries: function(objectId)
     {
         var parsedObjectId = this._parseObjectId(objectId);
         var object = this._objectForId(parsedObjectId);
         if (!object || typeof object !== "object")
             return "Could not find object with given id";
         var entries = InjectedScriptHost.collectionEntries(object);
@@ skipping 732 matching lines @@
     this.callFrameId = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + "}";
     this.functionName = callFrame.functionName;
     this.functionLocation = { scriptId: toString(callFrame.sourceID), lineNumber: callFrame.functionLine, columnNumber: callFrame.functionColumn, __proto__: null };
     this.location = { scriptId: toString(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column, __proto__: null };
     this.scopeChain = this._wrapScopeChain(callFrame);
     this.this = injectedScript._wrapObject(callFrame.thisObject, "backtrace");
     if (callFrame.isAtReturn)
         this.returnValue = injectedScript._wrapObject(callFrame.returnValue, "backtrace");
 }
 
-InjectedScript.CallFrameProxy.prototype = {
-    /**
-     * @param {!JavaScriptCallFrame} callFrame
-     * @return {!Array.<!DebuggerAgent.Scope>}
-     */
-    _wrapScopeChain: function(callFrame)
-    {
-        var scopeChain = callFrame.scopeChain;
-        var scopeChainProxy = [];
-        for (var i = 0; i < scopeChain.length; ++i)
-            scopeChainProxy[i] = InjectedScript.CallFrameProxy._createScopeJson(callFrame.scopeType(i), callFrame.scopeName(i), scopeChain[i], "backtrace", callFrame.scopeStartLocation(i), callFrame.scopeEndLocation(i) );
-        return scopeChainProxy;
-    },
-
-    __proto__: null
-}
-
 /**
  * @const
  * @type {!Object.<number, !DebuggerAgent.ScopeType>}
  */
 InjectedScript.CallFrameProxy._scopeTypeNames = {

[dgozman, 2016/03/18 23:27:55]

Remove this, make JavaScriptCallFrame return string.

[kozy, 2016/03/19 00:40:23]

Done.

     0: "global",
     1: "local",
     2: "with",
     3: "closure",
     4: "catch",
     5: "block",
     6: "script",
     __proto__: null
 };
 
-/**
- * @param {number} scopeTypeCode
- * @param {string} scopeName
- * @param {*} scopeObject
- * @param {string} groupId
- * @param {?DebuggerAgent.Location=} startLocation
- * @param {?DebuggerAgent.Location=} endLocation
- * @return {!DebuggerAgent.Scope}
- */
-InjectedScript.CallFrameProxy._createScopeJson = function(scopeTypeCode, scopeName, scopeObject, groupId, startLocation, endLocation)
-{
-    var scope = {
-        object: injectedScript._wrapObject(scopeObject, groupId),
-        type: InjectedScript.CallFrameProxy._scopeTypeNames[scopeTypeCode],
-        __proto__: null
-    };
-    if (scopeName)
-        scope.name = scopeName;
+InjectedScript.CallFrameProxy.prototype = {
+    /**
+     * @param {!JavaScriptCallFrame} callFrame
+     * @return {!Array.<!DebuggerAgent.Scope>}
+     */
+    _wrapScopeChain: function(callFrame)
+    {
+        var scopeChain = callFrame.scopeChain;
+        var scopeChainProxy = [];
+        for (var i = 0; i < scopeChain.length; ++i)
+            scopeChainProxy[i] = this._createScopeJson(callFrame.scopeType(i), callFrame.scopeName(i), scopeChain[i], callFrame.scopeStartLocation(i), callFrame.scopeEndLocation(i) );
+        return scopeChainProxy;
+    },
 
-    if (startLocation)
-        scope.startLocation = startLocation;
-    if (endLocation)
-        scope.endLocation = endLocation;
+    /**
+     * @param {number} scopeTypeCode
+     * @param {string} scopeName
+     * @param {*} scopeObject
+     * @param {?DebuggerAgent.Location} startLocation
+     * @param {?DebuggerAgent.Location} endLocation
+     * @return {!DebuggerAgent.Scope}
+     */
+    _createScopeJson: function(scopeTypeCode, scopeName, scopeObject, startLocation, endLocation)
+    {
+        var scope = {
+            object: injectedScript._wrapObject(scopeObject, "backtrace"),
+            type: InjectedScript.CallFrameProxy._scopeTypeNames[scopeTypeCode],
+            __proto__: null
+        };
+        if (scopeName)
+            scope.name = scopeName;
 
-    return scope;
+        if (startLocation)
+            scope.startLocation = startLocation;
+        if (endLocation)
+            scope.endLocation = endLocation;
+
+        return scope;
+    },
+
+    __proto__: null
 }
 
 /**
  * @constructor
  * @param {!CommandLineAPIImpl} commandLineAPIImpl
  */
 function CommandLineAPI(commandLineAPIImpl)
 {
     /**
      * @param {string} name The name of the method for which a toString method should be generated.
@@ skipping 317 matching lines @@
      */
     _logEvent: function(event)
     {
         inspectedGlobalObject.console.log(event.type, event);
     }
 }
 
 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
 return injectedScript;
 })