Chromium Code Reviews| Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js |
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js |
| index 50451b5834e655a8e5b4d2d8d6d2939a34f611a5..f3d0e6bdf134e952a61cfdaee0bd72dcdad658c5 100644 |
| --- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js |
| +++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js |
| @@ -317,6 +317,19 @@ InjectedScript.prototype = { |
| }, |
| /** |
| + * @param {!Array<!Object>} array |
|
dgozman
2016/03/23 00:12:35
!Array<*>
kozy
2016/03/23 02:13:10
Done.
|
| + * @param {string} groupName |
| + * @param {boolean} canAccessInspectedGlobalObject |
| + * @param {boolean} forceValueType |
| + * @param {boolean} generatePreview |
| + */ |
| + wrapObjectsInArray: function(array, groupName, canAccessInspectedGlobalObject, forceValueType, generatePreview) |
| + { |
| + for (var i = 0; i < array.length; ++i) |
| + array[i] = this.wrapObject(array[i], groupName, canAccessInspectedGlobalObject, forceValueType, generatePreview); |
| + }, |
| + |
| + /** |
| * @param {*} object |
| * @return {!RuntimeAgent.RemoteObject} |
| */ |
| @@ -607,25 +620,6 @@ InjectedScript.prototype = { |
| }, |
| /** |
| - * @param {?Object} callFrame |
| - * @return {!Array.<!InjectedScript.CallFrameProxy>|boolean} |
| - */ |
| - wrapCallFrames: function(callFrame) |
| - { |
| - if (!callFrame) |
| - return false; |
| - |
| - var result = []; |
| - var depth = 0; |
| - do { |
| - result[depth] = new InjectedScript.CallFrameProxy(depth, callFrame); |
| - callFrame = callFrame.caller; |
| - ++depth; |
| - } while (callFrame); |
| - return result; |
| - }, |
| - |
| - /** |
| * @return {!CommandLineAPI} |
| */ |
| commandLineAPI: function() |
| @@ -1155,66 +1149,6 @@ InjectedScript.RemoteObject.prototype = { |
| /** |
| * @constructor |
| - * @param {number} ordinal |
| - * @param {!JavaScriptCallFrame} callFrame |
| - */ |
| -InjectedScript.CallFrameProxy = function(ordinal, callFrame) |
| -{ |
| - 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] = this._createScopeJson(callFrame.scopeType(i), callFrame.scopeName(i), scopeChain[i], callFrame.scopeStartLocation(i), callFrame.scopeEndLocation(i) ); |
| - return scopeChainProxy; |
| - }, |
| - |
| - /** |
| - * @param {!DebuggerAgent.ScopeType<string>} scopeType |
| - * @param {string} scopeName |
| - * @param {*} scopeObject |
| - * @param {?DebuggerAgent.Location} startLocation |
| - * @param {?DebuggerAgent.Location} endLocation |
| - * @return {!DebuggerAgent.Scope} |
| - */ |
| - _createScopeJson: function(scopeType, scopeName, scopeObject, startLocation, endLocation) |
| - { |
| - var scope = { |
| - object: injectedScript._wrapObject(scopeObject, "backtrace"), |
| - type: scopeType, |
| - __proto__: null |
| - }; |
| - if (scopeName) |
| - scope.name = scopeName; |
| - |
| - if (startLocation) |
| - scope.startLocation = startLocation; |
| - if (endLocation) |
| - scope.endLocation = endLocation; |
| - |
| - return scope; |
| - }, |
| - |
| - __proto__: null |
| -} |
| - |
| -/** |
| - * @constructor |
| * @param {!CommandLineAPIImpl} commandLineAPIImpl |
| */ |
| function CommandLineAPI(commandLineAPIImpl) |