Title: [89562] trunk/Source/WebCore
- Revision
- 89562
- Author
- mnaga...@chromium.org
- Date
- 2011-06-23 05:51:18 -0700 (Thu, 23 Jun 2011)
Log Message
2011-06-23 Mikhail Naganov <mnaga...@chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: [Chromium] Fix showing dominator leaf nodes after r89457
https://bugs.webkit.org/show_bug.cgi?id=63250
* inspector/front-end/DetailedHeapshotView.js:
* inspector/front-end/HeapSnapshot.js:
(WebInspector.HeapSnapshotFilteredOrderedIterator.prototype.get isEmpty):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89561 => 89562)
--- trunk/Source/WebCore/ChangeLog 2011-06-23 12:48:37 UTC (rev 89561)
+++ trunk/Source/WebCore/ChangeLog 2011-06-23 12:51:18 UTC (rev 89562)
@@ -1,3 +1,14 @@
+2011-06-23 Mikhail Naganov <mnaga...@chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: [Chromium] Fix showing dominator leaf nodes after r89457
+ https://bugs.webkit.org/show_bug.cgi?id=63250
+
+ * inspector/front-end/DetailedHeapshotView.js:
+ * inspector/front-end/HeapSnapshot.js:
+ (WebInspector.HeapSnapshotFilteredOrderedIterator.prototype.get isEmpty):
+
2011-06-23 Vsevolod Vlasov <vse...@chromium.org>
Reviewed by Yury Semikhatsky.
Modified: trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js (89561 => 89562)
--- trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2011-06-23 12:48:37 UTC (rev 89561)
+++ trunk/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2011-06-23 12:51:18 UTC (rev 89562)
@@ -912,7 +912,7 @@
return;
var row = event.target.enclosingNodeOrSelfWithNodeName("tr");
var nodeItem = row._dataGridNode;
- if (!nodeItem)
+ if (!nodeItem || !nodeItem.route)
return;
function expandRoute()
{
Modified: trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js (89561 => 89562)
--- trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js 2011-06-23 12:48:37 UTC (rev 89561)
+++ trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js 2011-06-23 12:51:18 UTC (rev 89562)
@@ -1075,13 +1075,25 @@
{
if (this._iterationOrder)
return !this._iterationOrder.length;
+ if (this._unfilteredIterationOrder && !this._filter)
+ return !this._unfilteredIterationOrder.length;
var iterator = this._iterator;
- if (!this._filter) {
+ if (!this._unfilteredIterationOrder && !this._filter) {
iterator.first();
return !iterator.hasNext();
+ } else if (!this._unfilteredIterationOrder) {
+ for (iterator.first(); iterator.hasNext(); iterator.next())
+ if (this._filter(iterator.item))
+ return false;
+ } else {
+ var order = this._unfilteredIterationOrder.constructor === Array ?
+ this._unfilteredIterationOrder : this._unfilteredIterationOrder.slice(0);
+ for (var i = 0, l = order.length; i < l; ++i) {
+ iterator.index = order[i];
+ if (this._filter(iterator.item))
+ return false;
+ }
}
- for (iterator.first(); iterator.hasNext(); iterator.next())
- if (this._filter(iterator.item)) return false;
return true;
},
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
