Index: third_party/WebKit/Source/devtools/front_end/components/ObjectPropertiesSection.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/components/ObjectPropertiesSection.js b/third_party/WebKit/Source/devtools/front_end/components/ObjectPropertiesSection.js |
index 1caef0413a06aa74054ca3efc4b379c5298f2370..5f9d406b81aa8eec22eed1aa4f21b687c513ea82 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/components/ObjectPropertiesSection.js |
+++ b/third_party/WebKit/Source/devtools/front_end/components/ObjectPropertiesSection.js |
@@ -575,7 +575,12 @@ WebInspector.ObjectPropertyTreeElement.populateWithProperties = function(treeNod |
if (internalProperties) { |
for (var i = 0; i < internalProperties.length; i++) { |
internalProperties[i].parentObject = value; |
- treeNode.appendChild(new WebInspector.ObjectPropertyTreeElement(internalProperties[i])); |
+ var treeElement = new WebInspector.ObjectPropertyTreeElement(internalProperties[i]); |
+ if (internalProperties[i].name === "[[Entries]]") { |
+ treeElement.setExpandable(true); |
+ treeElement.expand(); |
+ } |
+ treeNode.appendChild(treeElement); |
} |
} |
if (value && value.type === "function") { |
@@ -595,9 +600,6 @@ WebInspector.ObjectPropertyTreeElement.populateWithProperties = function(treeNod |
if (!hasTargetFunction) |
treeNode.appendChild(new WebInspector.FunctionScopeMainTreeElement(value)); |
} |
- if (value && value.type === "object" && (value.subtype === "map" || value.subtype === "set" || value.subtype === "iterator")) |
- treeNode.appendChild(new WebInspector.CollectionEntriesMainTreeElement(value)); |
- |
WebInspector.ObjectPropertyTreeElement._appendEmptyPlaceholderIfNeeded(treeNode, emptyPlaceholder); |
} |
@@ -730,56 +732,6 @@ WebInspector.FunctionScopeMainTreeElement.prototype = { |
/** |
* @constructor |
* @extends {TreeElement} |
- * @param {!WebInspector.RemoteObject} remoteObject |
- */ |
-WebInspector.CollectionEntriesMainTreeElement = function(remoteObject) |
-{ |
- TreeElement.call(this, "<entries>", true); |
- this.toggleOnClick = true; |
- this.selectable = false; |
- this._remoteObject = remoteObject; |
- this.expand(); |
-} |
- |
-WebInspector.CollectionEntriesMainTreeElement.prototype = { |
- onpopulate: function() |
- { |
- /** |
- * @param {?Array.<!DebuggerAgent.CollectionEntry>} entries |
- * @this {WebInspector.CollectionEntriesMainTreeElement} |
- */ |
- function didGetCollectionEntries(entries) |
- { |
- if (!entries) |
- return; |
- this.removeChildren(); |
- |
- var entriesLocalObject = []; |
- var runtimeModel = this._remoteObject.target().runtimeModel; |
- for (var i = 0; i < entries.length; ++i) { |
- var entry = entries[i]; |
- if (entry.key) { |
- entriesLocalObject.push(new WebInspector.MapEntryLocalJSONObject({ |
- key: runtimeModel.createRemoteObject(entry.key), |
- value: runtimeModel.createRemoteObject(entry.value) |
- })); |
- } else { |
- entriesLocalObject.push(runtimeModel.createRemoteObject(entry.value)); |
- } |
- } |
- WebInspector.ObjectPropertyTreeElement._populate(this, WebInspector.RemoteObject.fromLocalObject(entriesLocalObject), true, WebInspector.UIString("No Entries")); |
- this.title = "<entries>[" + entriesLocalObject.length + "]"; |
- } |
- |
- this._remoteObject.collectionEntries(didGetCollectionEntries.bind(this)); |
- }, |
- |
- __proto__: TreeElement.prototype |
-} |
- |
-/** |
- * @constructor |
- * @extends {TreeElement} |
* @param {string} title |
* @param {!WebInspector.RemoteObject} remoteObject |
*/ |