Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (199633 => 199634)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-17 01:20:00 UTC (rev 199634)
@@ -1,3 +1,38 @@
+2016-04-16 Matt Baker <[email protected]>
+
+ display:inline on the tbody is causing the width of the iframe to be shrunk to the minimum size of its text.
+ https://bugs.webkit.org/show_bug.cgi?id=15666
+
+ Reviewed by Timothy Hatcher.
+
+ Fix a regression caused by the recent Timelines UI redesign, and
+ reorder TimelineDataGrid's constructor arguments now that most
+ timeline views no longer have an associated tree outline.
+
+ * UserInterface/Views/HeapAllocationsTimelineView.js:
+ (WebInspector.HeapAllocationsTimelineView):
+ * UserInterface/Views/LayoutTimelineView.js:
+ (WebInspector.LayoutTimelineView):
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView):
+ * UserInterface/Views/RenderingFrameTimelineView.js:
+ (WebInspector.RenderingFrameTimelineView):
+ * UserInterface/Views/ScriptDetailsTimelineView.js:
+ (WebInspector.ScriptDetailsTimelineView):
+ Reorder constructor parameters and omit optional treeOutline and
+ synchronizerDelegate arguments when they aren't needed.
+
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid):
+ Reorder constructor arguments so that treeOutline can be optional.
+ (WebInspector.TimelineDataGrid.prototype._refreshDirtyDataGridNodes):
+ Nodes should be refreshed and re-inserted in the data grid without
+ requiring a grid synchronizer. If a synchronizer exists, re-insert
+ the tree element for the node. Since the syncronizer is disabled the
+ order of grid/tree operations doesn't matter.
+
2016-04-15 Joseph Pecoraro <[email protected]>
Web Inspector: sourceMappingURL not used when sourceURL is set
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -75,7 +75,7 @@
this._snapshotListPathComponent = new WebInspector.HierarchicalPathComponent(WebInspector.UIString("Snapshot List"), "snapshot-list-icon", "snapshot-list", false, false);
this._snapshotListPathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.Clicked, this._snapshotListPathComponentClicked, this);
- this._dataGrid = new WebInspector.TimelineDataGrid(null, columns);
+ this._dataGrid = new WebInspector.TimelineDataGrid(columns);
this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("heap-allocations-timeline-view-sort", "timestamp");
this._dataGrid.sortOrderSetting = new WebInspector.Setting("heap-allocations-timeline-view-sort-order", WebInspector.DataGrid.SortOrder.Ascending);
this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -68,7 +68,7 @@
for (var column in columns)
columns[column].sortable = true;
- this._dataGrid = new WebInspector.LayoutTimelineDataGrid(null, columns);
+ this._dataGrid = new WebInspector.LayoutTimelineDataGrid(columns);
this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -80,7 +80,7 @@
for (var column in columns)
columns[column].sortable = true;
- this._dataGrid = new WebInspector.TimelineDataGrid(this._contentTreeOutline, columns);
+ this._dataGrid = new WebInspector.TimelineDataGrid(columns, this._contentTreeOutline);
this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("network-grid-content-view-sort", "requestSent");
this._dataGrid.sortOrderSetting = new WebInspector.Setting("network-grid-content-view-sort-order", WebInspector.DataGrid.SortOrder.Ascending);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -87,7 +87,7 @@
for (var column in columns)
columns[column].sortable = true;
- this._dataGrid = new WebInspector.TimelineDataGrid(null, columns);
+ this._dataGrid = new WebInspector.TimelineDataGrid(columns);
this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("network-timeline-view-sort", "requestSent");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -76,7 +76,7 @@
for (var column in columns)
columns[column].sortable = true;
- this._dataGrid = new WebInspector.TimelineDataGrid(null, columns, this);
+ this._dataGrid = new WebInspector.TimelineDataGrid(columns);
this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("rendering-frame-timeline-view-sort", "startTime");
this._dataGrid.sortOrderSetting = new WebInspector.Setting("rendering-frame-timeline-view-sort-order", WebInspector.DataGrid.SortOrder.Ascending);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -71,7 +71,7 @@
for (var column in columns)
columns[column].sortable = true;
- this._dataGrid = new WebInspector.ScriptTimelineDataGrid(null, columns, this);
+ this._dataGrid = new WebInspector.ScriptTimelineDataGrid(columns);
this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("script-timeline-view-sort", "startTime");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (199633 => 199634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-04-17 00:40:55 UTC (rev 199633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-04-17 01:20:00 UTC (rev 199634)
@@ -25,7 +25,7 @@
WebInspector.TimelineDataGrid = class TimelineDataGrid extends WebInspector.DataGrid
{
- constructor(treeOutline, columns, delegate, editCallback, deleteCallback)
+ constructor(columns, treeOutline, delegate, editCallback, deleteCallback)
{
super(columns, editCallback, deleteCallback);
@@ -226,16 +226,16 @@
this._scheduledDataGridNodeRefreshIdentifier = undefined;
}
- if (!this._dirtyDataGridNodes || !this._treeOutlineDataGridSynchronizer)
+ if (!this._dirtyDataGridNodes)
return;
- var selectedNode = this.selectedNode;
- var sortComparator = this._sortComparator.bind(this);
- var treeOutline = this._treeOutlineDataGridSynchronizer.treeOutline;
+ let selectedNode = this.selectedNode;
+ let sortComparator = this._sortComparator.bind(this);
- this._treeOutlineDataGridSynchronizer.enabled = false;
+ if (this._treeOutlineDataGridSynchronizer)
+ this._treeOutlineDataGridSynchronizer.enabled = false;
- for (var dataGridNode of this._dirtyDataGridNodes) {
+ for (let dataGridNode of this._dirtyDataGridNodes) {
dataGridNode.refresh();
if (!this.sortColumnIdentifier)
@@ -244,32 +244,38 @@
if (dataGridNode === selectedNode)
this._ignoreSelectionEvent = true;
- var treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
+ console.assert(!dataGridNode.parent || dataGridNode.parent === this);
+ if (dataGridNode.parent === this)
+ this.removeChild(dataGridNode);
+
+ let insertionIndex = insertionIndexForObjectInListSortedByFunction(dataGridNode, this.children, sortComparator);
+ this.insertChild(dataGridNode, insertionIndex);
+
+ if (dataGridNode === selectedNode) {
+ selectedNode.revealAndSelect();
+ this._ignoreSelectionEvent = false;
+ }
+
+ if (!this._treeOutlineDataGridSynchronizer)
+ continue;
+
+ let treeOutline = this._treeOutlineDataGridSynchronizer.treeOutline;
+ let treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
console.assert(treeElement);
console.assert(!treeElement.parent || treeElement.parent === treeOutline);
if (treeElement.parent === treeOutline)
treeOutline.removeChild(treeElement);
- console.assert(!dataGridNode.parent || dataGridNode.parent === this);
- if (dataGridNode.parent === this)
- this.removeChild(dataGridNode);
-
- var insertionIndex = insertionIndexForObjectInListSortedByFunction(dataGridNode, this.children, sortComparator);
treeOutline.insertChild(treeElement, insertionIndex);
- this.insertChild(dataGridNode, insertionIndex);
// Adding the tree element back to the tree outline subjects it to filters.
// Make sure we keep the hidden state in-sync while the synchronizer is disabled.
dataGridNode.element.classList.toggle("hidden", treeElement.hidden);
-
- if (dataGridNode === selectedNode) {
- selectedNode.revealAndSelect();
- this._ignoreSelectionEvent = false;
- }
}
- this._treeOutlineDataGridSynchronizer.enabled = true;
+ if (this._treeOutlineDataGridSynchronizer)
+ this._treeOutlineDataGridSynchronizer.enabled = true;
this._dirtyDataGridNodes = null;
}
