<!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>[169390] trunk</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/169390">169390</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 10:59:25 -0700 (Tue, 27 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION: Audio volume scrubber does not show volume level thumb
&lt;rdar://problem/16902004&gt;
https://bugs.webkit.org/show_bug.cgi?id=133310

Reviewed by Dean Jackson.


Source/WebCore: 
This was just a silly mistake on my part with the setting of the pagination
layers. Layers inside transforms are supposed to clear out their pagination
status based off their ancestor containing block layers, and not off the
enclosing pagination layer.
        
Added fast/multicol/pagination/nested-transforms.html

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updatePagination):

LayoutTests: 
* fast/multicol/pagination/nested-transforms.html: Added.
* platform/mac/fast/multicol/pagination/nested-transforms-expected.png: Added.
* platform/mac/fast/multicol/pagination/nested-transforms-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolpaginationnestedtransformshtml">trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationnestedtransformsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationnestedtransformsexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169389 => 169390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-05-27 17:36:55 UTC (rev 169389)
+++ trunk/LayoutTests/ChangeLog        2014-05-27 17:59:25 UTC (rev 169390)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-27  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        REGRESSION: Audio volume scrubber does not show volume level thumb
+        &lt;rdar://problem/16902004&gt;
+        https://bugs.webkit.org/show_bug.cgi?id=133310
+
+        Reviewed by Dean Jackson.
+
+        * fast/multicol/pagination/nested-transforms.html: Added.
+        * platform/mac/fast/multicol/pagination/nested-transforms-expected.png: Added.
+        * platform/mac/fast/multicol/pagination/nested-transforms-expected.txt: Added.
+
</ins><span class="cx"> 2014-05-27  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Mac] media controls should prevent 'click' events from reaching the page
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolpaginationnestedtransformshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html (0 => 169390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html                                (rev 0)
+++ trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html        2014-05-27 17:59:25 UTC (rev 169390)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;
+&lt;head&gt;
+ &lt;script&gt;
+        if (window.internals)
+            internals.setPagination(&quot;RightToLeftPaginated&quot;, 20, 180);
+    &lt;/script&gt;
+&lt;style&gt;
+div {
+    height: 20px;
+    width: 80px;
+}
+
+.outer {
+    -webkit-transform: translateX(0);
+}
+
+.inner {
+    background-color: blue;
+    -webkit-transform: translateX(0);
+}
+&lt;/style&gt;
+&lt;/head&gt;
+  &lt;body &gt;
+  &lt;br&gt;&lt;/br&gt;
+  &lt;div class=&quot;outer&quot;&gt;&lt;div id=&quot;foo&quot; class=&quot;inner&quot;&gt;&lt;/div&gt;&lt;/div&gt;
+  &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolpaginationnestedtransformsexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastmulticolpaginationnestedtransformsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt (0 => 169390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt        2014-05-27 17:59:25 UTC (rev 169390)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+    RenderMultiColumnSet at (0,0) size 800x600
+layer at (0,0) size 180x600
+  RenderMultiColumnFlowThread at (0,0) size 180x600
+layer at (0,0) size 180x600
+  RenderBlock {HTML} at (0,0) size 180x600
+    RenderBody {BODY} at (8,8) size 164x584
+      RenderBlock (anonymous) at (0,0) size 164x36
+        RenderBR {BR} at (0,0) size 0x18
+        RenderBR {BR} at (0,18) size 0x18
+layer at (8,44) size 80x20
+  RenderBlock {DIV} at (0,36) size 80x20
+layer at (8,44) size 80x20
+  RenderBlock {DIV} at (0,0) size 80x20 [bgcolor=#0000FF]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169389 => 169390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-27 17:36:55 UTC (rev 169389)
+++ trunk/Source/WebCore/ChangeLog        2014-05-27 17:59:25 UTC (rev 169390)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-27  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        REGRESSION: Audio volume scrubber does not show volume level thumb
+        &lt;rdar://problem/16902004&gt;
+        https://bugs.webkit.org/show_bug.cgi?id=133310
+
+        Reviewed by Dean Jackson.
+
+        This was just a silly mistake on my part with the setting of the pagination
+        layers. Layers inside transforms are supposed to clear out their pagination
+        status based off their ancestor containing block layers, and not off the
+        enclosing pagination layer.
+        
+        Added fast/multicol/pagination/nested-transforms.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updatePagination):
+
</ins><span class="cx"> 2014-05-27  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Mac] media controls should prevent 'click' events from reaching the page
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (169389 => 169390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-05-27 17:36:55 UTC (rev 169389)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-05-27 17:59:25 UTC (rev 169390)
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx">         // paint the transform multiple times in each column, so we don't have to use
</span><span class="cx">         // fragments for the transformed content.
</span><span class="cx">         m_enclosingPaginationLayer = parent()-&gt;enclosingPaginationLayer();
</span><del>-        if (m_enclosingPaginationLayer &amp;&amp; m_enclosingPaginationLayer-&gt;hasTransform())
</del><ins>+        if (parent()-&gt;hasTransform())
</ins><span class="cx">             m_enclosingPaginationLayer = 0;
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -972,7 +972,7 @@
</span><span class="cx">             // paint the transform multiple times in each column, so we don't have to use
</span><span class="cx">             // fragments for the transformed content.
</span><span class="cx">             m_enclosingPaginationLayer = containingBlock-&gt;layer()-&gt;enclosingPaginationLayer();
</span><del>-            if (m_enclosingPaginationLayer &amp;&amp; m_enclosingPaginationLayer-&gt;hasTransform())
</del><ins>+            if (containingBlock-&gt;layer()-&gt;hasTransform())
</ins><span class="cx">                 m_enclosingPaginationLayer = 0;
</span><span class="cx">             return;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>