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 4c75155cf9d3db65bdba67f7ce040dd683dbfb09..50451b5834e655a8e5b4d2d8d6d2939a34f611a5 100644 |
| --- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js |
| +++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptSource.js |
| @@ -406,15 +406,6 @@ InjectedScript.prototype = { |
| return "{\"injectedScriptId\":" + injectedScriptId + ",\"id\":" + id + "}"; |
| }, |
| - /** |
| - * @param {string} objectId |
| - * @return {!Object} |
| - */ |
| - _parseObjectId: function(objectId) |
| - { |
| - return nullifyObjectProto(/** @type {!Object} */ (InjectedScriptHost.eval("(" + objectId + ")"))); |
| - }, |
| - |
| clearLastEvaluationResult: function() |
| { |
| delete this._lastResult; |
| @@ -429,21 +420,15 @@ InjectedScript.prototype = { |
| }, |
| /** |
| - * @param {string} objectId |
| + * @param {!Object} object |
| + * @param {string} objectGroupName |
| * @param {boolean} ownProperties |
| * @param {boolean} accessorPropertiesOnly |
| * @param {boolean} generatePreview |
| - * @return {!Array.<!RuntimeAgent.PropertyDescriptor>|boolean} |
| + * @return {!Array<!RuntimeAgent.PropertyDescriptor>|boolean} |
| */ |
| - getProperties: function(objectId, ownProperties, accessorPropertiesOnly, generatePreview) |
| + getProperties: function(object, objectGroupName, ownProperties, accessorPropertiesOnly, generatePreview) |
| { |
| - var parsedObjectId = this._parseObjectId(objectId); |
| - var object = this._objectForId(parsedObjectId); |
| - var objectGroupName = InjectedScriptHost.idToObjectGroupName(parsedObjectId.id); |
|
dgozman
2016/03/22 00:51:44
Kill this one as well.
kozy
2016/03/22 01:07:59
Done.
|
| - |
| - if (!this._isDefined(object) || isSymbol(object)) |
| - return false; |
| - object = /** @type {!Object} */ (object); |
| var descriptors = []; |
| var iter = this._propertyDescriptors(object, ownProperties, accessorPropertiesOnly, undefined); |
| // Go over properties, wrap object values. |
| @@ -673,15 +658,6 @@ InjectedScript.prototype = { |
| }, |
| /** |
| - * @param {!Object} objectId |
| - * @return {!Object|symbol|undefined} |
| - */ |
| - _objectForId: function(objectId) |
| - { |
| - return objectId.injectedScriptId === injectedScriptId ? /** @type{!Object|symbol|undefined} */ (InjectedScriptHost.objectForId(objectId.id)) : void 0; |
| - }, |
| - |
| - /** |
| * @param {*} object |
| * @return {boolean} |
| */ |