<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199747] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199747">199747</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-04-19 16:41:25 -0700 (Tue, 19 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: DataGrid should be virtualized so it only renders visible rows
https://bugs.webkit.org/show_bug.cgi?id=156663
rdar://problem/25765256
Reviewed by Joseph Pecoraro.
* UserInterface/Views/ComputedStyleDetailsPanel.js:
(WebInspector.ComputedStyleDetailsPanel.prototype.set containerRegions):
Call updateLayoutIfNeeded since we don't use views here.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView.prototype._formatParameterAsTable):
Set inline and variableHeightRows to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
* UserInterface/Views/DOMTreeDataGrid.js:
(WebInspector.DOMTreeDataGrid):
Set inline to true, remove direct classList add.
* UserInterface/Views/DataGrid.css:
(.data-grid td):
(.data-grid table.data):
(.data-grid:not(.variable-height-rows) table.data):
(.data-grid:not(.variable-height-rows) table.data.odd-first-zebra-stripe):
(.data-grid.variable-height-rows table.data tr:nth-child(odd)):
(.data-grid.variable-height-rows table.data tr:nth-child(even)):
(.data-grid.variable-height-rows.odd-first-zebra-stripe table.data tr:nth-child(odd)):
(.data-grid.variable-height-rows.odd-first-zebra-stripe table.data tr:nth-child(even)):
(.data-grid.variable-height-rows table.data tr.filler):
Updated styles to support variable height rows directly and flipping the order of the stripes
when the virtual table starts at an odd row.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid): Added rowHeight and rows.
(WebInspector.DataGrid.prototype.get inline): Added.
(WebInspector.DataGrid.prototype.set inline): Added.
(WebInspector.DataGrid.prototype.get variableHeightRows): Added.
(WebInspector.DataGrid.prototype.set variableHeightRows): Added.
(WebInspector.DataGrid.prototype.layout): Call _updateVisibleRows.
(WebInspector.DataGrid.prototype._noteRowsChanged): Added.
(WebInspector.DataGrid.prototype._updateVisibleRows): Added.
(WebInspector.DataGrid.prototype._sortNodesCallback): Update to not use the DOM.
(WebInspector.DataGridNode.prototype.set hasChildren): Call needsLayout.
(WebInspector.DataGridNode.prototype.collapse): Call needsLayout.
(WebInspector.DataGridNode.prototype.expand): Call needsLayout.
(WebInspector.DataGridNode.prototype._attach): Call _noteRowsChanged.
(WebInspector.DataGridNode.prototype._detach): Call _noteRowsChanged.
* UserInterface/Views/DatabaseUserQuerySuccessView.js:
(WebInspector.DatabaseUserQuerySuccessView):
Set inline to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
* UserInterface/Views/DetailsSection.css:
(.details-section > .content .data-grid td.value-column):
(.details-section > .content .data-grid table.data): Deleted.
(.details-section > .content .data-grid tr:nth-child(even)): Deleted.
(.details-section > .content .data-grid tr:nth-child(odd)): Deleted.
Now handled by DataGrid.css directly.
* UserInterface/Views/DetailsSectionDataGridRow.js:
(WebInspector.DetailsSectionDataGridRow.prototype.set dataGrid):
Set inline and variableHeightRows to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
* UserInterface/Views/HeapSnapshotInstancesContentView.css:
(.heap-snapshot > .data-grid tr:matches(.selected, :hover) td .go-to-arrow):
(.heap-snapshot .icon):
Remove margin-top to fit inside 20px row instead of 21px.
* UserInterface/Views/IndexedDatabaseObjectStoreContentView.css:
(.content-view.indexed-database-object-store > .data-grid table.data): Deleted.
(.content-view.indexed-database-object-store > .data-grid table.data tr:nth-child(even)): Deleted.
(.content-view.indexed-database-object-store > .data-grid table.data tr:nth-child(odd)): Deleted.
(.content-view.indexed-database-object-store > .data-grid table.data tr.filler): Deleted.
Now handled by DataGrid.css directly.
* UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
(WebInspector.IndexedDatabaseObjectStoreContentView):
Set variableHeightRows to true.
* UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
(WebInspector.LayerTreeDetailsSidebarPanel.prototype._buildDataGridSection):
Set inline to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
* UserInterface/Views/LogContentView.css:
(.console-item .data-grid table.data): Deleted.
(.console-item .data-grid table.data tr:nth-child(even)): Deleted.
Now handled by DataGrid.css directly.
* UserInterface/Views/NetworkGridContentView.css:
(.content-view.network-grid > .data-grid td): Deleted.
(.content-view.network-grid > .data-grid table.data): Deleted.
Now handled by DataGrid.css directly.
* UserInterface/Views/ProbeSetDataGrid.js:
(WebInspector.ProbeSetDataGrid):
Set inline to true, remove direct classList add.
* UserInterface/Views/ProfileView.css:
(.profile > .data-grid td .icon):
(.profile > .data-grid tr:matches(.selected, :hover) .go-to-arrow):
Remove margin-top to fit inside 20px row instead of 21px.
* UserInterface/Views/TimelineRecordingContentView.css:
(.content-view.timeline-recording > .content-browser > .content-view-container > .timeline-view > .data-grid td): Deleted.
(.content-view.timeline-recording > .content-browser > .content-view-container > .timeline-view > .data-grid table.data): Deleted.
Now handled by DataGrid.css directly.
* UserInterface/Views/Variables.css:
(:root): Added zebra stripe colors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsComputedStyleDetailsPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDatabaseUserQuerySuccessViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseUserQuerySuccessView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectioncss">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionDataGridRowjs">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionDataGridRow.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstancesContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProfileViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVariablescss">trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -1,3 +1,115 @@
</span><ins>+2016-04-18 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: DataGrid should be virtualized so it only renders visible rows
+
+ https://bugs.webkit.org/show_bug.cgi?id=156663
+ rdar://problem/25765256
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ComputedStyleDetailsPanel.js:
+ (WebInspector.ComputedStyleDetailsPanel.prototype.set containerRegions):
+ Call updateLayoutIfNeeded since we don't use views here.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsTable):
+ Set inline and variableHeightRows to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
+
+ * UserInterface/Views/DOMTreeDataGrid.js:
+ (WebInspector.DOMTreeDataGrid):
+ Set inline to true, remove direct classList add.
+
+ * UserInterface/Views/DataGrid.css:
+ (.data-grid td):
+ (.data-grid table.data):
+ (.data-grid:not(.variable-height-rows) table.data):
+ (.data-grid:not(.variable-height-rows) table.data.odd-first-zebra-stripe):
+ (.data-grid.variable-height-rows table.data tr:nth-child(odd)):
+ (.data-grid.variable-height-rows table.data tr:nth-child(even)):
+ (.data-grid.variable-height-rows.odd-first-zebra-stripe table.data tr:nth-child(odd)):
+ (.data-grid.variable-height-rows.odd-first-zebra-stripe table.data tr:nth-child(even)):
+ (.data-grid.variable-height-rows table.data tr.filler):
+ Updated styles to support variable height rows directly and flipping the order of the stripes
+ when the virtual table starts at an odd row.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid): Added rowHeight and rows.
+ (WebInspector.DataGrid.prototype.get inline): Added.
+ (WebInspector.DataGrid.prototype.set inline): Added.
+ (WebInspector.DataGrid.prototype.get variableHeightRows): Added.
+ (WebInspector.DataGrid.prototype.set variableHeightRows): Added.
+ (WebInspector.DataGrid.prototype.layout): Call _updateVisibleRows.
+ (WebInspector.DataGrid.prototype._noteRowsChanged): Added.
+ (WebInspector.DataGrid.prototype._updateVisibleRows): Added.
+ (WebInspector.DataGrid.prototype._sortNodesCallback): Update to not use the DOM.
+ (WebInspector.DataGridNode.prototype.set hasChildren): Call needsLayout.
+ (WebInspector.DataGridNode.prototype.collapse): Call needsLayout.
+ (WebInspector.DataGridNode.prototype.expand): Call needsLayout.
+ (WebInspector.DataGridNode.prototype._attach): Call _noteRowsChanged.
+ (WebInspector.DataGridNode.prototype._detach): Call _noteRowsChanged.
+
+ * UserInterface/Views/DatabaseUserQuerySuccessView.js:
+ (WebInspector.DatabaseUserQuerySuccessView):
+ Set inline to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
+
+ * UserInterface/Views/DetailsSection.css:
+ (.details-section > .content .data-grid td.value-column):
+ (.details-section > .content .data-grid table.data): Deleted.
+ (.details-section > .content .data-grid tr:nth-child(even)): Deleted.
+ (.details-section > .content .data-grid tr:nth-child(odd)): Deleted.
+ Now handled by DataGrid.css directly.
+
+ * UserInterface/Views/DetailsSectionDataGridRow.js:
+ (WebInspector.DetailsSectionDataGridRow.prototype.set dataGrid):
+ Set inline and variableHeightRows to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
+
+ * UserInterface/Views/HeapSnapshotInstancesContentView.css:
+ (.heap-snapshot > .data-grid tr:matches(.selected, :hover) td .go-to-arrow):
+ (.heap-snapshot .icon):
+ Remove margin-top to fit inside 20px row instead of 21px.
+
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.css:
+ (.content-view.indexed-database-object-store > .data-grid table.data): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid table.data tr:nth-child(even)): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid table.data tr:nth-child(odd)): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid table.data tr.filler): Deleted.
+ Now handled by DataGrid.css directly.
+
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+ (WebInspector.IndexedDatabaseObjectStoreContentView):
+ Set variableHeightRows to true.
+
+ * UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
+ (WebInspector.LayerTreeDetailsSidebarPanel.prototype._buildDataGridSection):
+ Set inline to true, remove direct classList add. Call updateLayoutIfNeeded since we don't use views here.
+
+ * UserInterface/Views/LogContentView.css:
+ (.console-item .data-grid table.data): Deleted.
+ (.console-item .data-grid table.data tr:nth-child(even)): Deleted.
+ Now handled by DataGrid.css directly.
+
+ * UserInterface/Views/NetworkGridContentView.css:
+ (.content-view.network-grid > .data-grid td): Deleted.
+ (.content-view.network-grid > .data-grid table.data): Deleted.
+ Now handled by DataGrid.css directly.
+
+ * UserInterface/Views/ProbeSetDataGrid.js:
+ (WebInspector.ProbeSetDataGrid):
+ Set inline to true, remove direct classList add.
+
+ * UserInterface/Views/ProfileView.css:
+ (.profile > .data-grid td .icon):
+ (.profile > .data-grid tr:matches(.selected, :hover) .go-to-arrow):
+ Remove margin-top to fit inside 20px row instead of 21px.
+
+ * UserInterface/Views/TimelineRecordingContentView.css:
+ (.content-view.timeline-recording > .content-browser > .content-view-container > .timeline-view > .data-grid td): Deleted.
+ (.content-view.timeline-recording > .content-browser > .content-view-container > .timeline-view > .data-grid table.data): Deleted.
+ Now handled by DataGrid.css directly.
+
+ * UserInterface/Views/Variables.css:
+ (:root): Added zebra stripe colors.
+
</ins><span class="cx"> 2016-04-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r199635) Web Inspector: Percentages in Heap Allocations view are too large
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsComputedStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -147,6 +147,8 @@
</span><span class="cx"> this._containerRegionsDataGrid.appendChild(new WebInspector.DOMTreeDataGridNode(regionNode));
</span><span class="cx">
</span><span class="cx"> this._containerRegionsFlowSection.element.classList.remove("hidden");
</span><ins>+
+ this._containerRegionsDataGrid.updateLayoutIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cssStyleDeclarationTextEditorShowProperty(property, showSource)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -804,9 +804,13 @@
</span><span class="cx"> // FIXME: Should we output something extra if the preview is lossless?
</span><span class="cx">
</span><span class="cx"> var dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, flatValues);
</span><del>- dataGrid.element.classList.add("inline");
</del><ins>+ dataGrid.inline = true;
+ dataGrid.variableHeightRows = true;
+
</ins><span class="cx"> element.appendChild(dataGrid.element);
</span><span class="cx">
</span><ins>+ dataGrid.updateLayoutIfNeeded();
+
</ins><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGrid.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGrid.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGrid.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -34,8 +34,10 @@
</span><span class="cx">
</span><span class="cx"> this._previousHoveredElement = null;
</span><span class="cx">
</span><del>- this.element.classList.add("inline", "dom-tree-data-grid");
</del><ins>+ this.inline = true;
</ins><span class="cx">
</span><ins>+ this.element.classList.add("dom-tree-data-grid");
+
</ins><span class="cx"> this.element.addEventListener("mousemove", this._onmousemove.bind(this), false);
</span><span class="cx"> this.element.addEventListener("mouseout", this._onmouseout.bind(this), false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -109,18 +109,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .data-grid table.data {
</span><del>- position: absolute;
</del><ins>+ position: relative;
</ins><span class="cx"> left: 0;
</span><del>- top: 0;
</del><span class="cx"> right: 0;
</span><del>- bottom: 0;
</del><span class="cx"> height: 100%;
</span><span class="cx"> border-top: 0 none transparent;
</span><del>- background-image: linear-gradient(to bottom, white, white 50%, hsl(214, 41%, 96%) 50%, hsl(214, 41%, 96%));
- background-size: 100% 42px;
</del><span class="cx"> table-layout: fixed;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.data-grid:not(.variable-height-rows) table.data {
+ background-image: linear-gradient(to bottom, var(--even-zebra-stripe-row-background-color), var(--even-zebra-stripe-row-background-color) 50%, var(--odd-zebra-stripe-row-background-color) 50%, var(--odd-zebra-stripe-row-background-color));
+ background-size: 100% 40px;
+}
+
+.data-grid:not(.variable-height-rows) table.data.odd-first-zebra-stripe {
+ background-image: linear-gradient(to bottom, var(--odd-zebra-stripe-row-background-color), var(--odd-zebra-stripe-row-background-color) 50%, var(--even-zebra-stripe-row-background-color) 50%, var(--even-zebra-stripe-row-background-color));
+}
+
</ins><span class="cx"> .data-grid.inline table.data {
</span><span class="cx"> position: static;
</span><span class="cx"> }
</span><span class="lines">@@ -133,10 +138,31 @@
</span><span class="cx"> display: table-row;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.data-grid.variable-height-rows table.data tr:nth-child(odd) {
+ background-color: var(--odd-zebra-stripe-row-background-color);
+}
+
+.data-grid.variable-height-rows table.data tr:nth-child(even) {
+ background-color: var(--even-zebra-stripe-row-background-color);
+}
+
+.data-grid.variable-height-rows.odd-first-zebra-stripe table.data tr:nth-child(odd) {
+ background-color: var(--even-zebra-stripe-row-background-color);
+}
+
+.data-grid.variable-height-rows.odd-first-zebra-stripe table.data tr:nth-child(even) {
+ background-color: var(--odd-zebra-stripe-row-background-color);
+}
+
+.data-grid.variable-height-rows table.data tr.filler {
+ /* FIXME: This should show an alternating stripe, but it needs to know if the last row is even or odd. */
+ background-color: var(--even-zebra-stripe-row-background-color);
+}
+
</ins><span class="cx"> .data-grid td {
</span><span class="cx"> vertical-align: top;
</span><del>- height: 12px;
- line-height: 17px;
</del><ins>+ height: 16px;
+ line-height: 16px;
</ins><span class="cx"> padding: 2px 6px;
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> overflow: hidden;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> this._sortOrder = WebInspector.DataGrid.SortOrder.Indeterminate;
</span><span class="cx"> this._sortOrderSetting = null;
</span><span class="cx">
</span><ins>+ this._rows = [];
+
</ins><span class="cx"> this.children = [];
</span><span class="cx"> this.selectedNode = null;
</span><span class="cx"> this.expandNodesWhenArrowing = false;
</span><span class="lines">@@ -47,6 +49,7 @@
</span><span class="cx"> this.selected = false;
</span><span class="cx"> this.dataGrid = this;
</span><span class="cx"> this.indentWidth = 15;
</span><ins>+ this.rowHeight = 20;
</ins><span class="cx"> this.resizers = [];
</span><span class="cx"> this._columnWidthsInitialized = false;
</span><span class="cx">
</span><span class="lines">@@ -66,9 +69,15 @@
</span><span class="cx"> this._scrollContainerElement = document.createElement("div");
</span><span class="cx"> this._scrollContainerElement.className = "data-container";
</span><span class="cx">
</span><del>- this._dataTableElement = this._scrollContainerElement.createChild("table");
- this._dataTableElement.className = "data";
</del><ins>+ this._scrollListener = () => this.needsLayout();
+ this._scrollContainerElement.addEventListener("scroll", this._scrollListener);
</ins><span class="cx">
</span><ins>+ this._topDataTableMarginElement = this._scrollContainerElement.createChild("div");
+
+ this._dataTableElement = this._scrollContainerElement.createChild("table", "data");
+
+ this._bottomDataTableMarginElement = this._scrollContainerElement.createChild("div");
+
</ins><span class="cx"> this._dataTableElement.addEventListener("mousedown", this._mouseDownInDataTable.bind(this));
</span><span class="cx"> this._dataTableElement.addEventListener("click", this._clickInDataTable.bind(this));
</span><span class="cx"> this._dataTableElement.addEventListener("contextmenu", this._contextMenuInDataTable.bind(this), true);
</span><span class="lines">@@ -79,6 +88,7 @@
</span><span class="cx"> this._dataTableElement.addEventListener("dblclick", this._ondblclick.bind(this), false);
</span><span class="cx"> this._editCallback = editCallback;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (deleteCallback)
</span><span class="cx"> this._deleteCallback = deleteCallback;
</span><span class="cx">
</span><span class="lines">@@ -87,9 +97,9 @@
</span><span class="cx">
</span><span class="cx"> // This element is used by DataGridNodes to manipulate table rows and cells.
</span><span class="cx"> this.dataTableBodyElement = this._dataTableElement.createChild("tbody");
</span><del>- this._fillerRowElement = this.dataTableBodyElement.createChild("tr");
- this._fillerRowElement.className = "filler";
</del><span class="cx">
</span><ins>+ this._fillerRowElement = this.dataTableBodyElement.createChild("tr", "filler");
+
</ins><span class="cx"> this.element.appendChild(this._headerTableElement);
</span><span class="cx"> this.element.appendChild(this._scrollContainerElement);
</span><span class="cx">
</span><span class="lines">@@ -237,6 +247,40 @@
</span><span class="cx"> this.sortColumnIdentifier = this._sortColumnIdentifierSetting.value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get inline() { return this._inline; }
+
+ set inline(x)
+ {
+ if (this._inline === x)
+ return;
+
+ this._inline = x || false;
+
+ this._element.classList.toggle("inline", this._inline);
+
+ if (this._inline || this._variableHeightRows)
+ this._scrollContainerElement.removeEventListener("scroll", this._scrollListener);
+ else
+ this._scrollContainerElement.addEventListener("scroll", this._scrollListener);
+ }
+
+ get variableHeightRows() { return this._variableHeightRows; }
+
+ set variableHeightRows(x)
+ {
+ if (this._variableHeightRows === x)
+ return;
+
+ this._variableHeightRows = x || false;
+
+ this._element.classList.toggle("variable-height-rows", this._variableHeightRows);
+
+ if (this._inline || this._variableHeightRows)
+ this._scrollContainerElement.removeEventListener("scroll", this._scrollListener);
+ else
+ this._scrollContainerElement.addEventListener("scroll", this._scrollListener);
+ }
+
</ins><span class="cx"> _updateSortedColumn(oldSortColumnIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (this._sortColumnIdentifierSetting)
</span><span class="lines">@@ -506,11 +550,9 @@
</span><span class="cx"> if (column["collapsesGroup"]) {
</span><span class="cx"> console.assert(column["group"] !== column["collapsesGroup"]);
</span><span class="cx">
</span><del>- var dividerElement = headerCellElement.createChild("div");
- dividerElement.className = "divider";
</del><ins>+ var dividerElement = headerCellElement.createChild("div", "divider");
</ins><span class="cx">
</span><del>- var collapseDiv = headerCellElement.createChild("div");
- collapseDiv.className = "collapser-button";
</del><ins>+ var collapseDiv = headerCellElement.createChild("div", "collapser-button");
</ins><span class="cx"> collapseDiv.title = this._collapserButtonCollapseColumnsToolTip();
</span><span class="cx"> listeners.register(collapseDiv, "mouseover", this._mouseoverColumnCollapser);
</span><span class="cx"> listeners.register(collapseDiv, "mouseout", this._mouseoutColumnCollapser);
</span><span class="lines">@@ -638,6 +680,8 @@
</span><span class="cx"> this._positionResizerElements();
</span><span class="cx"> this._positionHeaderViews();
</span><span class="cx"> }
</span><ins>+
+ this._updateVisibleRows();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> columnWidthsMap()
</span><span class="lines">@@ -791,6 +835,81 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _noteRowsChanged()
+ {
+ this._previousRevealedRowCount = NaN;
+
+ this.needsLayout();
+ }
+
+ _updateVisibleRows()
+ {
+ if (this._inline || this._variableHeightRows) {
+ // Inline DataGrids always show all their rows, so we can't virtualize them.
+ // In general, inline DataGrids usually have a small number of rows.
+
+ // FIXME: This is a slow path for variable height rows that is similar to the old
+ // non-virtualized DataGrid. Ideally we would track row height per-DataGridNode
+ // and then we could virtualize even those cases. Currently variable height row
+ // DataGrids don't usually have many rows, other than IndexedDB.
+
+ let nextElement = this.dataTableBodyElement.lastChild;
+ for (let i = this._rows.length - 1; i >= 0; --i) {
+ let rowElement = this._rows[i].element;
+ if (rowElement.nextSibling !== nextElement)
+ this.dataTableBodyElement.insertBefore(rowElement, nextElement);
+ nextElement = rowElement;
+ }
+
+ return;
+ }
+
+ let rowHeight = this.rowHeight;
+ let updateOffsetThreshold = rowHeight * 5;
+
+ let revealedRows = this._rows.filter((row) => row.revealed);
+
+ let scrollTop = this._scrollContainerElement.scrollTop;
+ let scrollHeight = this._scrollContainerElement.offsetHeight;
+
+ let currentTopMargin = this._topDataTableMarginElement.offsetHeight;
+ let currentBottomMargin = this._bottomDataTableMarginElement.offsetHeight;
+ let currentTableBottom = currentTopMargin + this._dataTableElement.offsetHeight;
+
+ let belowTopThreshold = !currentTopMargin || scrollTop > currentTopMargin + updateOffsetThreshold;
+ let aboveBottomThreshold = !currentBottomMargin || scrollTop + scrollHeight < currentTableBottom - updateOffsetThreshold;
+
+ if (belowTopThreshold && aboveBottomThreshold && this._previousRevealedRowCount === revealedRows.length)
+ return;
+
+ this._previousRevealedRowCount = revealedRows.length;
+
+ let overflowPadding = updateOffsetThreshold * 3;
+
+ let topHiddenRowCount = Math.max(0, Math.floor((scrollTop - overflowPadding) / rowHeight));
+ let visibleRowCount = Math.ceil((scrollHeight + (overflowPadding * 2)) / rowHeight);
+ let bottomHiddenRowCount = Math.max(0, revealedRows.length - topHiddenRowCount - visibleRowCount);
+
+ let marginTop = topHiddenRowCount * rowHeight;
+ let marginBottom = bottomHiddenRowCount * rowHeight;
+
+ this._topDataTableMarginElement.style.height = marginTop + "px";
+ this._bottomDataTableMarginElement.style.height = marginBottom + "px";
+
+ this._dataTableElement.classList.toggle("odd-first-zebra-stripe", !!(topHiddenRowCount % 2));
+
+ this.dataTableBodyElement.removeChildren();
+
+ for (let i = topHiddenRowCount; i < topHiddenRowCount + visibleRowCount; ++i) {
+ let rowDataGridNode = revealedRows[i];
+ if (!rowDataGridNode)
+ continue;
+ this.dataTableBodyElement.appendChild(rowDataGridNode.element);
+ }
+
+ this.dataTableBodyElement.appendChild(this._fillerRowElement);
+ }
+
</ins><span class="cx"> addPlaceholderNode()
</span><span class="cx"> {
</span><span class="cx"> if (this.placeholderNode)
</span><span class="lines">@@ -938,10 +1057,10 @@
</span><span class="cx">
</span><span class="cx"> _sortNodesCallback(comparator)
</span><span class="cx"> {
</span><del>- function comparatorWrapper(aRow, bRow)
</del><ins>+ function comparatorWrapper(aNode, bNode)
</ins><span class="cx"> {
</span><del>- var aNode = aRow._dataGridNode;
- var bNode = bRow._dataGridNode;
</del><ins>+ console.assert(!aNode.hasChildren, "This sort method can't be used with parent nodes, children will be displayed out of order.");
+ console.assert(!bNode.hasChildren, "This sort method can't be used with parent nodes, children will be displayed out of order.");
</ins><span class="cx">
</span><span class="cx"> if (aNode.isPlaceholderNode)
</span><span class="cx"> return 1;
</span><span class="lines">@@ -959,29 +1078,23 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var tbody = this.dataTableBodyElement;
- var childNodes = tbody.childNodes;
- var fillerRowElement = tbody.lastChild;
</del><ins>+ this._rows.sort(comparatorWrapper.bind(this));
+ this._noteRowsChanged();
</ins><span class="cx">
</span><del>- var sortedRowElements = Array.prototype.slice.call(childNodes, 0, childNodes.length - 1);
- sortedRowElements.sort(comparatorWrapper.bind(this));
-
- tbody.removeChildren();
-
- var previousSiblingNode = null;
- for (var rowElement of sortedRowElements) {
- var node = rowElement._dataGridNode;
</del><ins>+ let previousSiblingNode = null;
+ for (let node of this._rows) {
</ins><span class="cx"> node.previousSibling = previousSiblingNode;
</span><span class="cx"> if (previousSiblingNode)
</span><span class="cx"> previousSiblingNode.nextSibling = node;
</span><del>- tbody.appendChild(rowElement);
</del><span class="cx"> previousSiblingNode = node;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (previousSiblingNode)
</span><span class="cx"> previousSiblingNode.nextSibling = null;
</span><span class="cx">
</span><del>- tbody.appendChild(fillerRowElement); // We expect to find a filler row when attaching nodes.
</del><ins>+ // A sortable data grid might not be added to a view, so it needs its layout updated here.
+ if (!this.parentView)
+ this.updateLayoutIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _toggledSortOrder()
</span><span class="lines">@@ -1625,16 +1738,12 @@
</span><span class="cx"> if (!this._element)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this._hasChildren)
- {
</del><ins>+ if (this._hasChildren) {
</ins><span class="cx"> this._element.classList.add("parent");
</span><span class="cx"> if (this.expanded)
</span><span class="cx"> this._element.classList.add("expanded");
</span><del>- }
- else
- {
</del><ins>+ } else
</ins><span class="cx"> this._element.classList.remove("parent", "expanded");
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get hasChildren()
</span><span class="lines">@@ -1838,8 +1947,10 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners("collapsed");
</span><span class="cx">
</span><del>- if (this.dataGrid)
</del><ins>+ if (this.dataGrid) {
</ins><span class="cx"> this.dataGrid.dispatchEventToListeners(WebInspector.DataGrid.Event.CollapsedNode, {dataGridNode: this});
</span><ins>+ this.dataGrid.needsLayout();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> collapseRecursively()
</span><span class="lines">@@ -1886,8 +1997,10 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners("expanded");
</span><span class="cx">
</span><del>- if (this.dataGrid)
</del><ins>+ if (this.dataGrid) {
</ins><span class="cx"> this.dataGrid.dispatchEventToListeners(WebInspector.DataGrid.Event.ExpandedNode, {dataGridNode: this});
</span><ins>+ this.dataGrid.needsLayout();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> expandRecursively()
</span><span class="lines">@@ -2055,27 +2168,28 @@
</span><span class="cx">
</span><span class="cx"> this._attached = true;
</span><span class="cx">
</span><del>- var nextElement = null;
</del><ins>+ let insertionIndex = -1;
</ins><span class="cx">
</span><span class="cx"> if (!this.isPlaceholderNode) {
</span><span class="cx"> var previousGridNode = this.traversePreviousNode(true, true);
</span><del>- if (previousGridNode && previousGridNode.element.parentNode)
- nextElement = previousGridNode.element.nextSibling;
- else if (!previousGridNode)
- nextElement = this.dataGrid.dataTableBodyElement.firstChild;
</del><ins>+ insertionIndex = this.dataGrid._rows.indexOf(previousGridNode);
+ if (insertionIndex === -1)
+ insertionIndex = 0;
+ else
+ insertionIndex++;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // If there is no next grid node, then append before the last child since the last child is the filler row.
- console.assert(this.dataGrid.dataTableBodyElement.lastChild.classList.contains("filler"));
</del><ins>+ if (insertionIndex === -1)
+ this.dataGrid._rows.push(this);
+ else
+ this.dataGrid._rows.insertAtIndex(this, insertionIndex);
</ins><span class="cx">
</span><del>- if (!nextElement)
- nextElement = this.dataGrid.dataTableBodyElement.lastChild;
</del><ins>+ this.dataGrid._noteRowsChanged();
</ins><span class="cx">
</span><del>- this.dataGrid.dataTableBodyElement.insertBefore(this.element, nextElement);
-
- if (this.expanded)
</del><ins>+ if (this.expanded) {
</ins><span class="cx"> for (var i = 0; i < this.children.length; ++i)
</span><span class="cx"> this.children[i]._attach();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _detach()
</span><span class="lines">@@ -2085,8 +2199,8 @@
</span><span class="cx">
</span><span class="cx"> this._attached = false;
</span><span class="cx">
</span><del>- if (this._element && this._element.parentNode)
- this._element.parentNode.removeChild(this._element);
</del><ins>+ this.dataGrid._rows.remove(this, true);
+ this.dataGrid._noteRowsChanged();
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < this.children.length; ++i)
</span><span class="cx"> this.children[i]._detach();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDatabaseUserQuerySuccessViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseUserQuerySuccessView.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseUserQuerySuccessView.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseUserQuerySuccessView.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -31,8 +31,11 @@
</span><span class="cx">
</span><span class="cx"> this._dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values);
</span><span class="cx"> if (this._dataGrid) {
</span><del>- this._dataGrid.element.classList.add("inline");
</del><ins>+ this._dataGrid.inline = true;
+
</ins><span class="cx"> this.resultElement.appendChild(this._dataGrid.element);
</span><ins>+
+ this._dataGrid.updateLayoutIfNeeded();
</ins><span class="cx"> } else {
</span><span class="cx"> this.resultElement.classList.add("no-results");
</span><span class="cx"> this.resultElement.textContent = WebInspector.UIString("Query returned no results.");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectioncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -262,22 +262,12 @@
</span><span class="cx"> border-bottom: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.details-section > .content .data-grid table.data {
- background-image: none;
-}
-
-.details-section > .content .data-grid tr:nth-child(even) {
- background-color: white;
-}
-
-.details-section > .content .data-grid tr:nth-child(odd) {
- background-color: hsl(214, 41%, 96%);
-}
-
</del><span class="cx"> .details-section > .content .data-grid td.value-column {
</span><span class="cx"> height: auto;
</span><span class="cx"> line-height: initial;
</span><span class="cx"> white-space: normal;
</span><ins>+ padding-top: 4px;
+ padding-bottom: 4px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .details-section > .content .data-grid td.value-column > div {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionDataGridRowjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionDataGridRow.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionDataGridRow.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionDataGridRow.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -49,10 +49,13 @@
</span><span class="cx"> this._dataGrid = dataGrid || null;
</span><span class="cx">
</span><span class="cx"> if (dataGrid) {
</span><del>- dataGrid.element.classList.add("inline");
</del><ins>+ dataGrid.inline = true;
+ dataGrid.variableHeightRows = true;
</ins><span class="cx">
</span><span class="cx"> this.hideEmptyMessage();
</span><span class="cx"> this.element.appendChild(dataGrid.element);
</span><ins>+
+ dataGrid.updateLayoutIfNeeded();
</ins><span class="cx"> } else
</span><span class="cx"> this.showEmptyMessage();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstancesContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 16px;
</span><span class="cx"> height: 16px;
</span><del>- margin-top: 1px;
</del><span class="cx"> margin-left: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,7 +77,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 16px;
</span><span class="cx"> height: 16px;
</span><del>- margin-top: 1px;
</del><span class="cx"> margin-right: 4px;
</span><span class="cx"> content: url(../Images/TypeUndefined.svg);
</span><span class="cx"> }
</span><span class="lines">@@ -122,8 +120,7 @@
</span><span class="cx"> .heap-snapshot > .data-grid td .formatted-node-preview,
</span><span class="cx"> .heap-snapshot > .data-grid td .object-preview {
</span><span class="cx"> text-indent: 0; /* Do not inherit the DataGrid's indent. */
</span><del>- display: inline-block;
- height: 16px;
</del><ins>+ line-height: initial;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .heap-snapshot-instance-popover-content > .title {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -31,23 +31,6 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.indexed-database-object-store > .data-grid table.data {
- background-image: none;
-}
-
-.content-view.indexed-database-object-store > .data-grid table.data tr:nth-child(even) {
- background-color: white;
-}
-
-.content-view.indexed-database-object-store > .data-grid table.data tr:nth-child(odd) {
- background-color: hsl(214, 41%, 96%);
-}
-
-.content-view.indexed-database-object-store > .data-grid table.data tr.filler {
- /* FIXME: This should show an alternating stripe, but I couldn't make it work. */
- background-color: white;
-}
-
</del><span class="cx"> .content-view.indexed-database-object-store > .data-grid tr.selected {
</span><span class="cx"> background-color: hsl(210, 90%, 90%) !important;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._dataGrid = new WebInspector.DataGrid(columnInfo);
</span><ins>+ this._dataGrid.variableHeightRows = true;
</ins><span class="cx"> this._dataGrid.scrollContainer.addEventListener("scroll", this._dataGridScrolled.bind(this));
</span><span class="cx"> this.addSubview(this._dataGrid);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> columns.memory.width = "70px";
</span><span class="cx">
</span><span class="cx"> this._dataGrid = new WebInspector.DataGrid(columns);
</span><ins>+ this._dataGrid.inline = true;
</ins><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._selectedDataGridNodeChanged, this);
</span><span class="cx">
</span><span class="lines">@@ -145,7 +146,6 @@
</span><span class="cx"> this.sortOrderSetting = new WebInspector.Setting("layer-tree-details-sidebar-panel-sort-order", WebInspector.DataGrid.SortOrder.Descending);
</span><span class="cx">
</span><span class="cx"> var element = this._dataGrid.element;
</span><del>- element.classList.add("inline");
</del><span class="cx"> element.addEventListener("focus", this._dataGridGainedFocus.bind(this), false);
</span><span class="cx"> element.addEventListener("blur", this._dataGridLostFocus.bind(this), false);
</span><span class="cx"> element.addEventListener("click", this._dataGridWasClicked.bind(this), false);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -117,15 +117,6 @@
</span><span class="cx"> background-color: hsl(210, 90%, 90%) !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-item .data-grid table.data {
- background-image: none;
- background-color: white;
-}
-
-.console-item .data-grid table.data tr:nth-child(even) {
- background-color: hsl(214, 41%, 96%);
-}
-
</del><span class="cx"> .console-item .data-grid tr.selected {
</span><span class="cx"> background-color: hsl(210, 0%, 90%) !important;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -34,13 +34,3 @@
</span><span class="cx"> .content-view.network-grid > .data-grid th {
</span><span class="cx"> border-top: none;
</span><span class="cx"> }
</span><del>-
-.content-view.network-grid > .data-grid td {
- height: 16px;
- line-height: 16px;
-}
-
-.content-view.network-grid > .data-grid table.data {
- background-image: linear-gradient(to bottom, white, white 50%, hsl(0, 0%, 95%) 50%, hsl(0, 0%, 95%));
- background-size: 100% 40px;
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> this.probeSet = probeSet;
</span><span class="cx">
</span><del>- this.element.classList.add("inline");
</del><ins>+ this.inline = true;
</ins><span class="cx">
</span><span class="cx"> this._frameNodes = new Map;
</span><span class="cx"> this._lastUpdatedFrame = null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProfileViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 16px;
</span><span class="cx"> height: 16px;
</span><del>- margin-top: 1px;
</del><span class="cx"> margin-right: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,7 +76,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 16px;
</span><span class="cx"> height: 16px;
</span><del>- margin-top: 1px;
</del><span class="cx"> margin-left: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -61,13 +61,3 @@
</span><span class="cx"> .content-view.timeline-recording > .content-browser > .navigation-bar > .item.scope-bar.default-item-selected > .multiple .arrows {
</span><span class="cx"> color: black;
</span><span class="cx"> }
</span><del>-
-.content-view.timeline-recording > .content-browser > .content-view-container > .timeline-view > .data-grid td {
- height: 16px;
- line-height: 16px;
-}
-
-.content-view.timeline-recording > .content-browser > .content-view-container > .timeline-view > .data-grid table.data {
- background-image: linear-gradient(to bottom, white, white 50%, hsl(0, 0%, 95%) 50%, hsl(0, 0%, 95%));
- background-size: 100% 40px;
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVariablescss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css (199746 => 199747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-04-19 23:36:20 UTC (rev 199746)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-04-19 23:41:25 UTC (rev 199747)
</span><span class="lines">@@ -70,6 +70,9 @@
</span><span class="cx"> --memory-extra-fill-color: hsl(211, 53%, 70%);
</span><span class="cx"> --memory-extra-stroke-color: hsl(211, 53%, 55%);
</span><span class="cx">
</span><ins>+ --even-zebra-stripe-row-background-color: white;
+ --odd-zebra-stripe-row-background-color: hsl(0, 0%, 95%);
+
</ins><span class="cx"> --toolbar-height: 36px;
</span><span class="cx"> --tab-bar-height: 24px;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>