Title: [201010] branches/safari-602.1.32-branch/Source/WebInspectorUI
- Revision
- 201010
- Author
- [email protected]
- Date
- 2016-05-17 01:47:15 -0700 (Tue, 17 May 2016)
Log Message
Merge r200793. rdar://problem/26251756
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201009 => 201010)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-17 08:47:13 UTC (rev 201009)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-17 08:47:15 UTC (rev 201010)
@@ -1,5 +1,27 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200793. rdar://problem/26251756
+
+ 2016-05-12 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Timeline Reset button only resets the one active Script TimelineView
+ https://bugs.webkit.org/show_bug.cgi?id=157638
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ScriptClusterTimelineView.js:
+ (WebInspector.ScriptClusterTimelineView.prototype.reset):
+ Reset should reset all the views.
+
+ (WebInspector.ScriptClusterTimelineView.prototype.get navigationSidebarTreeOutline): Deleted.
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView.prototype.get navigationSidebarTreeOutline): Deleted.
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.get navigationSidebarTreeOutlineScopeBar): Deleted.
+ Remove dead code. Nobody calls these getters.
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200792. rdar://problem/26253394
2016-05-12 Joseph Pecoraro <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (201009 => 201010)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-05-17 08:47:13 UTC (rev 201009)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-05-17 08:47:15 UTC (rev 201010)
@@ -100,11 +100,6 @@
// Public
- get navigationSidebarTreeOutline()
- {
- return this._contentTreeOutline;
- }
-
get selectionPathComponents()
{
if (!this._contentTreeOutline.selectedTreeElement || this._contentTreeOutline.selectedTreeElement.hidden)
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js (201009 => 201010)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js 2016-05-17 08:47:13 UTC (rev 201009)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js 2016-05-17 08:47:15 UTC (rev 201010)
@@ -71,12 +71,18 @@
set endTime(x) { this._contentViewContainer.currentContentView.endTime = x; }
get currentTime() { return this._contentViewContainer.currentContentView.currentTime; }
set currentTime(x) { this._contentViewContainer.currentContentView.currentTime = x; }
- get navigationSidebarTreeOutline() { return this._contentViewContainer.currentContentView.navigationSidebarTreeOutline; }
- reset() { return this._contentViewContainer.currentContentView.reset(); }
updateFilter(filters) { return this._contentViewContainer.currentContentView.updateFilter(filters); }
filterDidChange() { return this._contentViewContainer.currentContentView.filterDidChange(); }
matchDataGridNodeAgainstCustomFilters(node) { return this._contentViewContainer.currentContentView.matchDataGridNodeAgainstCustomFilters(node); }
+ reset()
+ {
+ this._eventsContentView.reset();
+
+ if (this._profileContentView)
+ this._profileContentView.reset();
+ }
+
// Public
get eventsContentView()
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (201009 => 201010)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-05-17 08:47:13 UTC (rev 201009)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-05-17 08:47:15 UTC (rev 201010)
@@ -60,11 +60,6 @@
return this._scopeBar ? [this._scopeBar] : [];
}
- get navigationSidebarTreeOutlineScopeBar()
- {
- return this._scopeBar;
- }
-
get selectionPathComponents()
{
// Implemented by sub-classes if needed.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
