Title: [89996] branches/chromium/782/Source/WebCore/inspector/front-end
- Revision
- 89996
- Author
- [email protected]
- Date
- 2011-06-29 00:31:20 -0700 (Wed, 29 Jun 2011)
Log Message
Merge 89562 - 2011-06-23 Mikhail Naganov <[email protected]>
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):
[email protected]
BUG=87583
Review URL: http://codereview.chromium.org/7280004
Modified Paths
Diff
Modified: branches/chromium/782/Source/WebCore/inspector/front-end/DetailedHeapshotView.js (89995 => 89996)
--- branches/chromium/782/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2011-06-29 07:21:05 UTC (rev 89995)
+++ branches/chromium/782/Source/WebCore/inspector/front-end/DetailedHeapshotView.js 2011-06-29 07:31:20 UTC (rev 89996)
@@ -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: branches/chromium/782/Source/WebCore/inspector/front-end/HeapSnapshot.js (89995 => 89996)
--- branches/chromium/782/Source/WebCore/inspector/front-end/HeapSnapshot.js 2011-06-29 07:21:05 UTC (rev 89995)
+++ branches/chromium/782/Source/WebCore/inspector/front-end/HeapSnapshot.js 2011-06-29 07:31:20 UTC (rev 89996)
@@ -990,13 +990,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
