Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: Source/WebCore/inspector/front-end/HeapSnapshot.js

Issue 7280004: Merge 89562 - 2011-06-23 Mikhail Naganov <mnaganov@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/inspector/front-end/DetailedHeapshotView.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/inspector/front-end/HeapSnapshot.js
===================================================================
--- Source/WebCore/inspector/front-end/HeapSnapshot.js (revision 89995)
+++ Source/WebCore/inspector/front-end/HeapSnapshot.js (working copy)
@@ -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;
},
« no previous file with comments | « Source/WebCore/inspector/front-end/DetailedHeapshotView.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698