Title: [105865] trunk/Source/WebCore
- Revision
- 105865
- Author
- [email protected]
- Date
- 2012-01-25 04:25:42 -0800 (Wed, 25 Jan 2012)
Log Message
Web Inspector: DetailedHeapSnapshot: adjust node name cell format for the retainers tree.
https://bugs.webkit.org/show_bug.cgi?id=76989
Reviewed by Pavel Feldman.
* English.lproj/localizedStrings.js:
* inspector/front-end/DetailedHeapshotGridNodes.js:
(WebInspector.HeapSnapshotGenericObjectNode.prototype._createObjectCell):
(WebInspector.HeapSnapshotGenericObjectNode.prototype.get data):
(WebInspector.HeapSnapshotObjectNode):
(WebInspector.HeapSnapshotObjectNode.prototype._prefixObjectCell):
(WebInspector.HeapSnapshotObjectNode.prototype._postfixObjectCell):
* inspector/front-end/HeapSnapshot.js:
(WebInspector.HeapSnapshotEdgesProvider.prototype._serialize):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105864 => 105865)
--- trunk/Source/WebCore/ChangeLog 2012-01-25 12:01:49 UTC (rev 105864)
+++ trunk/Source/WebCore/ChangeLog 2012-01-25 12:25:42 UTC (rev 105865)
@@ -1,3 +1,20 @@
+2012-01-25 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: DetailedHeapSnapshot: adjust node name cell format for the retainers tree.
+ https://bugs.webkit.org/show_bug.cgi?id=76989
+
+ Reviewed by Pavel Feldman.
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/DetailedHeapshotGridNodes.js:
+ (WebInspector.HeapSnapshotGenericObjectNode.prototype._createObjectCell):
+ (WebInspector.HeapSnapshotGenericObjectNode.prototype.get data):
+ (WebInspector.HeapSnapshotObjectNode):
+ (WebInspector.HeapSnapshotObjectNode.prototype._prefixObjectCell):
+ (WebInspector.HeapSnapshotObjectNode.prototype._postfixObjectCell):
+ * inspector/front-end/HeapSnapshot.js:
+ (WebInspector.HeapSnapshotEdgesProvider.prototype._serialize):
+
2012-01-25 Vsevolod Vlasov <[email protected]>
Web Inspector: [InspectorIndexedDB] Pass Database, object stores and indexes meta information to frontend.
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js
(Binary files differ)
Modified: trunk/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js (105864 => 105865)
--- trunk/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js 2012-01-25 12:01:49 UTC (rev 105864)
+++ trunk/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js 2012-01-25 12:25:42 UTC (rev 105865)
@@ -207,7 +207,7 @@
cell.className = "object-column";
var div = document.createElement("div");
div.className = "source-code event-properties";
- div.style.overflow = "hidden";
+ div.style.overflow = "visible";
var data = ""
if (this._prefixObjectCell)
this._prefixObjectCell(div, data);
@@ -215,6 +215,8 @@
valueSpan.className = "value console-formatted-" + data.valueStyle;
valueSpan.textContent = data.value;
div.appendChild(valueSpan);
+ if (this._postfixObjectCell)
+ this._postfixObjectCell(div, data);
cell.appendChild(div);
cell.addStyleClass("disclosure");
if (this.depth)
@@ -263,7 +265,7 @@
valueStyle += " highlight";
if (this.detachedDOMTreeNode)
valueStyle += " detached-dom-tree-node";
- data["object"] = { valueStyle: valueStyle, value: value + " @" + this.snapshotNodeId };
+ data["object"] = { valueStyle: valueStyle, value: value + ": @" + this.snapshotNodeId };
var view = this.dataGrid.snapshotView;
data["shallowSize"] = view.showShallowSizeAsPercent ? WebInspector.UIString("%.2f%%", this._shallowSizePercent) : Number.bytesToString(this._shallowSize);
@@ -334,6 +336,8 @@
WebInspector.HeapSnapshotGenericObjectNode.call(this, tree, edge.node);
this._referenceName = edge.name;
this._referenceType = edge.type;
+ this._propertyAccessor = edge.propertyAccessor;
+ this._retainerNode = tree.showRetainingEdges;
this._isFromBaseSnapshot = isFromBaseSnapshot;
this._provider = this._createProvider(!isFromBaseSnapshot ? tree.snapshot : tree.baseSnapshot, edge.nodeIndex, tree);
this._updateHasChildren();
@@ -407,14 +411,32 @@
_prefixObjectCell: function(div, data)
{
+ if (this._retainerNode) {
+ var prefixSpan = document.createElement("span");
+ prefixSpan.textContent = WebInspector.UIString("retained by ");
+ div.appendChild(prefixSpan);
+ return;
+ }
+
var nameSpan = document.createElement("span");
nameSpan.className = data.nameClass;
nameSpan.textContent = data.name;
+ div.appendChild(nameSpan);
+
var separatorSpan = document.createElement("span");
separatorSpan.className = "separator";
separatorSpan.textContent = ": ";
- div.appendChild(nameSpan);
div.appendChild(separatorSpan);
+ },
+
+ _postfixObjectCell: function(div, data)
+ {
+ if (this._retainerNode) {
+ var referenceTypeSpan = document.createElement("span");
+ referenceTypeSpan.className = "console-formatted-object";
+ referenceTypeSpan.textContent = this._propertyAccessor;
+ div.appendChild(referenceTypeSpan);
+ }
}
}
Modified: trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js (105864 => 105865)
--- trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js 2012-01-25 12:01:49 UTC (rev 105864)
+++ trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js 2012-01-25 12:25:42 UTC (rev 105865)
@@ -1318,7 +1318,7 @@
WebInspector.HeapSnapshotEdgesProvider.prototype = {
_serialize: function(edge)
{
- return {name: edge.name, node: WebInspector.HeapSnapshotNodesProvider.prototype._serialize(edge.node), nodeIndex: edge.nodeIndex, type: edge.type};
+ return {name: edge.name, propertyAccessor: edge.toString(), node: WebInspector.HeapSnapshotNodesProvider.prototype._serialize(edge.node), nodeIndex: edge.nodeIndex, type: edge.type};
},
sort: function(comparator, leftBound, rightBound, count)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
