<!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>[171165] 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/171165">171165</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-07-16 18:47:10 -0700 (Wed, 16 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Subpixel rendering: Adjust cliprect with devicePixelFractionFromRenderer() before painting.
https://bugs.webkit.org/show_bug.cgi?id=134950
&lt;rdar://problem/17617994&gt;

Reviewed by Simon Fraser.

The cliprect coming from the graphics layer needs to be adjusted with the subpixel gap
from renderer. This is symmetric with the offsetting we do, when the dirty rect is sent off to the GraphicsLayer.
It puts us back to the correct coordinating system for intersecting with renderers.

Source/WebCore:
Test: compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers):
(WebCore::RenderLayer::clipToRect):

LayoutTests:
* compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position-expected.html: Added.
* compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html: 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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositinghidpicompositinglayerwithtilelayersonsubpixelpositionexpectedhtml">trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositinghidpicompositinglayerwithtilelayersonsubpixelpositionhtml">trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171164 => 171165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-07-17 01:38:06 UTC (rev 171164)
+++ trunk/LayoutTests/ChangeLog        2014-07-17 01:47:10 UTC (rev 171165)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-16  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Subpixel rendering: Adjust cliprect with devicePixelFractionFromRenderer() before painting.
+        https://bugs.webkit.org/show_bug.cgi?id=134950
+        &lt;rdar://problem/17617994&gt;
+
+        Reviewed by Simon Fraser.
+
+        The cliprect coming from the graphics layer needs to be adjusted with the subpixel gap
+        from renderer. This is symmetric with the offsetting we do, when the dirty rect is sent off to the GraphicsLayer.
+        It puts us back to the correct coordinating system for intersecting with renderers.
+
+        * compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position-expected.html: Added.
+        * compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html: Added.
+
</ins><span class="cx"> 2014-07-16  Roger Fong  &lt;roger_fong@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Captions container should not clip content.
</span></span></pre></div>
<a id="trunkLayoutTestscompositinghidpicompositinglayerwithtilelayersonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position-expected.html (0 => 171165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position-expected.html                                (rev 0)
+++ trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position-expected.html        2014-07-17 01:47:10 UTC (rev 171165)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This tests that when the compositing layer has multiple tile layers the content gets clipped properly across layers.&lt;/title&gt;
+&lt;style&gt;
+  .container {
+    position: fixed;
+    left: 0.25px;
+    top: 0px;
+  }
+
+  .inner {
+    -webkit-border-radius: 1px;
+    overflow: hidden;
+    width: 2100px; 
+  }
+  
+  .largebox {
+    width: 600px; 
+    height: 100px;         
+    background-color: red; 
+  }
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div class=container&gt;
+  &lt;div class=inner&gt;
+      &lt;div class=largebox&gt;&lt;/div&gt; 
+  &lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscompositinghidpicompositinglayerwithtilelayersonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html (0 => 171165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html                                (rev 0)
+++ trunk/LayoutTests/compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html        2014-07-17 01:47:10 UTC (rev 171165)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This tests that when the compositing layer has multiple tile layers the content gets clipped properly across layers.&lt;/title&gt;
+&lt;style&gt;
+  .container {
+    position: fixed;
+    left: 0.25px;
+    top: 0px;
+  }
+
+  .inner {
+    -webkit-border-radius: 1px;
+    overflow: hidden;
+    width: 2100px; 
+    -webkit-transform: translateZ(0);
+  }
+  
+  .largebox {
+    width: 600px; 
+    height: 100px; 
+    background-color: red; 
+  }
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div class=container&gt;
+  &lt;div class=inner&gt;
+      &lt;div class=largebox&gt;&lt;/div&gt; 
+  &lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171164 => 171165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-17 01:38:06 UTC (rev 171164)
+++ trunk/Source/WebCore/ChangeLog        2014-07-17 01:47:10 UTC (rev 171165)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-16  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Subpixel rendering: Adjust cliprect with devicePixelFractionFromRenderer() before painting.
+        https://bugs.webkit.org/show_bug.cgi?id=134950
+        &lt;rdar://problem/17617994&gt;
+
+        Reviewed by Simon Fraser.
+
+        The cliprect coming from the graphics layer needs to be adjusted with the subpixel gap
+        from renderer. This is symmetric with the offsetting we do, when the dirty rect is sent off to the GraphicsLayer.
+        It puts us back to the correct coordinating system for intersecting with renderers.
+
+        Test: compositing/hidpi-compositing-layer-with-tile-layers-on-subpixel-position.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::beginTransparencyLayers):
+        (WebCore::RenderLayer::clipToRect):
+
</ins><span class="cx"> 2014-07-16  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix a typo noticed by Darin.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (171164 => 171165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-07-17 01:38:06 UTC (rev 171164)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-07-17 01:47:10 UTC (rev 171165)
</span><span class="lines">@@ -2181,7 +2181,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // The dirtyRect is in the coords of the painting root.
</span><del>-    IntRect dirtyRect = enclosingIntRect(clip);
</del><ins>+    FloatRect adjustedClipRect = clip;
+    adjustedClipRect.move(-m_devicePixelFractionFromRenderer);
+    IntRect dirtyRect = enclosingIntRect(adjustedClipRect);
</ins><span class="cx"> 
</span><span class="cx">     if (graphicsLayer == m_graphicsLayer.get()
</span><span class="cx">         || graphicsLayer == m_foregroundLayer.get()
</span></span></pre>
</div>
</div>

</body>
</html>