<!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>[158794] branches/safari-537.73-branch/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/158794">158794</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-11-06 14:37:56 -0800 (Wed, 06 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/156675">r156675</a>.  &lt;rdar://problem/15406691&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53773branchSourceWebInspectorUIChangeLog">branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari53773branchSourceWebInspectorUIUserInterfaceLayerTreeDataGridjs">branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeDataGrid.js</a></li>
<li><a href="#branchessafari53773branchSourceWebInspectorUIUserInterfaceLayerTreeSidebarPanelcss">branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53773branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog (158793 => 158794)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog        2013-11-06 22:37:46 UTC (rev 158793)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog        2013-11-06 22:37:56 UTC (rev 158794)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2013-11-06  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r156675
+
+    2013-09-30  Antoine Quint  &lt;graouts@apple.com&gt;
+
+            Web Inspector: rows in the Layer sidebar panel may have the incorrect background color
+            https://bugs.webkit.org/show_bug.cgi?id=122108
+
+            Reviewed by Darin Adler.
+
+            The LayerTreeDataGrid is a custom DataGrid subclass which exposes a .setChildren() method
+            used to sort chidren without DOM order manipulation, for performance reason. However, since
+            the way the alternating background color is usually implemented is based on the built-in
+            CSS pseudo-classes working with DOM order, the background colors of nodes in the LayerTreeDataGrid
+            can be incorrect depending on the sort order and the number of nodes. To fix this, we now manually
+            set &quot;even&quot; and &quot;odd&quot; CSS classes on those nodes when they're sorted such that we have a chance
+            to style them as intended. 
+
+            * UserInterface/LayerTreeDataGrid.js:
+            (WebInspector.LayerTreeDataGrid.prototype._updateChildren):
+            Check if the data grid node index is even or odd and reflect this via an exclusive &quot;even&quot;
+            or &quot;odd&quot; CSS class name.
+
+            * UserInterface/LayerTreeSidebarPanel.css:
+            (.layer-tree.panel .data-container tbody &gt; tr.even):
+            (.layer-tree.panel .data-container tbody &gt; tr.odd):
+            Apply alternating colors based on the exclusive &quot;even&quot; and &quot;odd&quot; CSS class names as applied in
+            WebInspector.LayerTreeDataGrid.prototype._updateChildren().
+
+2013-11-06  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r154550
</span><span class="cx"> 
</span><span class="cx">     2013-08-24  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari53773branchSourceWebInspectorUIUserInterfaceLayerTreeDataGridjs"></a>
<div class="modfile"><h4>Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeDataGrid.js (158793 => 158794)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeDataGrid.js        2013-11-06 22:37:46 UTC (rev 158793)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeDataGrid.js        2013-11-06 22:37:56 UTC (rev 158794)
</span><span class="lines">@@ -92,6 +92,19 @@
</span><span class="cx">             
</span><span class="cx">             var ty = (i - child._domIndex) * 100;
</span><span class="cx">             child.element.style.webkitTransform = &quot;translateY(&quot; + ty + &quot;%)&quot;;
</span><ins>+
+            // Since the DOM order won't necessarily match the visual order of the
+            // children in the data grid we manually set &quot;even&quot; and &quot;odd&quot; and CSS
+            // class names on the data grid nodes so that they may be styled with
+            // a different mechanism than the built-in CSS pseudo-classes.
+            var classList = child.element.classList;
+            if (i % 2) {
+                classList.remove(&quot;odd&quot;);
+                classList.add(&quot;even&quot;);
+            } else {
+                classList.remove(&quot;even&quot;);
+                classList.add(&quot;odd&quot;);
+            }
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         this.hasChildren = this.children.length &gt; 0;
</span></span></pre></div>
<a id="branchessafari53773branchSourceWebInspectorUIUserInterfaceLayerTreeSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.css (158793 => 158794)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.css        2013-11-06 22:37:46 UTC (rev 158793)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.css        2013-11-06 22:37:56 UTC (rev 158794)
</span><span class="lines">@@ -166,6 +166,14 @@
</span><span class="cx">     display: block;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.layer-tree.panel .data-container tbody &gt; tr.even {
+    background-color: white;
+}
+
+.layer-tree.panel .data-container tbody &gt; tr.odd {
+    background-color: rgb(243, 246, 250);
+}
+
</ins><span class="cx"> /* Bottom bar */
</span><span class="cx"> 
</span><span class="cx"> .layer-tree.panel .bottom-bar {
</span></span></pre>
</div>
</div>

</body>
</html>