Title: [191317] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 191317
- Author
- matthew_han...@apple.com
- Date
- 2015-10-19 14:25:51 -0700 (Mon, 19 Oct 2015)
Log Message
Merge r190437. rdar://problem/23166302
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (191316 => 191317)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-19 21:21:44 UTC (rev 191316)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-19 21:25:51 UTC (rev 191317)
@@ -1,3 +1,27 @@
+2015-10-19 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r190437. rdar://problem/23166302
+
+ 2015-10-01 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Do not immediately create all ProfileNodeTreeElements when showing _javascript_ and Events timeline
+ https://bugs.webkit.org/show_bug.cgi?id=149726
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.shouldFilterPopulate):
+ (WebInspector.NavigationSidebarPanel.prototype._updateFilter):
+ (WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged):
+ We were populating during filtering if there were any custom filters.
+ However the TimelineSidebarPanel has custom filters (based on time and type)
+ but those don't need to trigger population. Delay population until it
+ would actually be needed (like a text search).
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.shouldFilterPopulate):
+ Do not populate on filter via this custom filters.
+
2015-10-16 Matthew Hanson <matthew_han...@apple.com>
Follow-up fix for r190246. rdar://problem/22939682
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (191316 => 191317)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-10-19 21:21:44 UTC (rev 191316)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-10-19 21:25:51 UTC (rev 191317)
@@ -292,6 +292,12 @@
this._updateFilter();
}
+ shouldFilterPopulate()
+ {
+ // Overriden by subclasses if needed.
+ return this.hasCustomFilters();
+ }
+
hasCustomFilters()
{
// Implemented by subclasses if needed.
@@ -520,7 +526,7 @@
// Don't populate if we don't have any active filters.
// We only need to populate when a filter needs to reveal.
- var dontPopulate = !this._filterBar.hasActiveFilters() && !this.hasCustomFilters();
+ var dontPopulate = !this._filterBar.hasActiveFilters() && !this.shouldFilterPopulate();
// Update the whole tree.
var currentTreeElement = this._contentTreeOutline.children[0];
@@ -545,7 +551,7 @@
{
// Don't populate if we don't have any active filters.
// We only need to populate when a filter needs to reveal.
- var dontPopulate = !this._filterBar.hasActiveFilters() && !this.hasCustomFilters();
+ var dontPopulate = !this._filterBar.hasActiveFilters() && !this.shouldFilterPopulate();
// Apply the filters to the tree element and its descendants.
var currentTreeElement = treeElement;
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (191316 => 191317)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-10-19 21:21:44 UTC (rev 191316)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-10-19 21:25:51 UTC (rev 191317)
@@ -381,6 +381,11 @@
this._displayedContentView.filterDidChange();
}
+ shouldFilterPopulate()
+ {
+ return false;
+ }
+
hasCustomFilters()
{
return true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
