Title: [193087] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193087
- Author
- [email protected]
- Date
- 2015-12-03 10:45:15 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r188330. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193086 => 193087)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:45:09 UTC (rev 193086)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:45:15 UTC (rev 193087)
@@ -1,5 +1,34 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r188330. rdar://problem/23221163
+
+ 2015-08-11 Matt Baker <[email protected]>
+
+ Web Inspector: TimelineView data not cleared when recording is reset
+ https://bugs.webkit.org/show_bug.cgi?id=147916
+
+ Reviewed by Timothy Hatcher.
+
+ Each derived timeline view maintains a separate array of timeline records. These weren't
+ cleared on reset, so switching to a timeline view after clearing the recording caused
+ the view to populate its tree outline.
+
+ * UserInterface/Views/LayoutTimelineView.js:
+ (WebInspector.LayoutTimelineView.set columns):
+ (WebInspector.LayoutTimelineView):
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView.set columns):
+ (WebInspector.NetworkTimelineView):
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView.prototype.reset):
+ (WebInspector.OverviewTimelineView.prototype._processPendingRepresentedObjects):
+ * UserInterface/Views/RenderingFrameTimelineView.js:
+ (WebInspector.RenderingFrameTimelineView.prototype.reset):
+ * UserInterface/Views/ScriptTimelineView.js:
+ (WebInspector.ScriptTimelineView.prototype.reset):
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r188328. rdar://problem/23221163
2015-08-11 Matt Baker <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (193086 => 193087)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-12-03 18:45:09 UTC (rev 193086)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-12-03 18:45:15 UTC (rev 193087)
@@ -154,6 +154,8 @@
this._hideHighlightIfNeeded();
this._dataGrid.reset();
+
+ this._pendingRecords = [];
}
// Protected
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (193086 => 193087)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2015-12-03 18:45:09 UTC (rev 193086)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2015-12-03 18:45:15 UTC (rev 193087)
@@ -148,6 +148,8 @@
super.reset();
this._dataGrid.reset();
+
+ this._pendingRecords = [];
}
// Protected
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (193086 => 193087)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-12-03 18:45:09 UTC (rev 193086)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2015-12-03 18:45:15 UTC (rev 193087)
@@ -142,6 +142,13 @@
return pathComponents;
}
+ reset()
+ {
+ super.reset();
+
+ this._pendingRepresentedObjects = [];
+ }
+
// Protected
treeElementPathComponentSelected(event)
@@ -306,7 +313,7 @@
_processPendingRepresentedObjects()
{
- if (!this._pendingRepresentedObjects || !this._pendingRepresentedObjects.length)
+ if (!this._pendingRepresentedObjects.length)
return;
for (var representedObject of this._pendingRepresentedObjects) {
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (193086 => 193087)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-12-03 18:45:09 UTC (rev 193086)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-12-03 18:45:15 UTC (rev 193087)
@@ -189,6 +189,8 @@
super.reset();
this._dataGrid.reset();
+
+ this._pendingRecords = [];
}
// Protected
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (193086 => 193087)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-12-03 18:45:09 UTC (rev 193086)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-12-03 18:45:15 UTC (rev 193087)
@@ -162,6 +162,8 @@
super.reset();
this._dataGrid.reset();
+
+ this._pendingRecords = [];
}
// Protected
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
