<!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>[197524] 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/197524">197524</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-03 15:55:52 -0800 (Thu, 03 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Subpixel rendering: Make collapsed borders painting subpixel aware.
https://bugs.webkit.org/show_bug.cgi?id=154980

Reviewed by David Hyatt.

This patch enables collapsed borders with odd pixel width paint on subpixel position.
Currently borders with odd pixels are split at integral position so that border-width: 3px;
paints 1px on the left(top) and 2px on the right(bottom) side. With this patch
we paint 1.5px on both sides(on 2x display).

Source/WebCore:

Test: fast/table/hidpi-collapsed-border-with-odd-pixel-width.html

* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::paintCollapsedBorders):

LayoutTests:

* fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html: Added.
* fast/table/hidpi-collapsed-border-with-odd-pixel-width.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="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttablehidpicollapsedborderwithoddpixelwidthexpectedhtml">trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttablehidpicollapsedborderwithoddpixelwidthhtml">trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197523 => 197524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-03-03 23:49:18 UTC (rev 197523)
+++ trunk/LayoutTests/ChangeLog        2016-03-03 23:55:52 UTC (rev 197524)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-03  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Subpixel rendering: Make collapsed borders painting subpixel aware.
+        https://bugs.webkit.org/show_bug.cgi?id=154980
+
+        Reviewed by David Hyatt.
+
+        This patch enables collapsed borders with odd pixel width paint on subpixel position.
+        Currently borders with odd pixels are split at integral position so that border-width: 3px;
+        paints 1px on the left(top) and 2px on the right(bottom) side. With this patch
+        we paint 1.5px on both sides(on 2x display).
+
+        * fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html: Added.
+        * fast/table/hidpi-collapsed-border-with-odd-pixel-width.html: Added.
+
</ins><span class="cx"> 2016-03-03  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         DFG should be able to compile StringReplace
</span></span></pre></div>
<a id="trunkLayoutTestsfasttablehidpicollapsedborderwithoddpixelwidthexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html (0 => 197524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html        2016-03-03 23:55:52 UTC (rev 197524)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This test that we can position collapsed border with odd width at device pixel.&lt;/title&gt;
+&lt;style&gt;
+
+div {
+  position: absolute;
+  height: 27px;
+  width: 29px;
+  border-color: red;
+  border-style: solid;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;left: 24.5px; top: 20.5px; border-width: 1px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 54px; top: 20px; width: 28.5px; height: 26.5px; border-width: 2px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 83.5px; top: 19.5px; width: 28px; height: 25.5px; border-width: 3px&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;left: 23px; top: 46px; border-width: 4px; width: 26.5px; height: 26.5px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 52.5px; top: 45.5px; width: 25.5px; height: 25.5px; border-width: 5px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 82px; top: 45px; width: 25px; height: 24px; border-width: 6px&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;left: 21.5px; top: 73.5px; border-width: 7px; width: 23.5px; height: 24px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 51px; top: 73px; width: 22px; height: 23px; border-width: 8px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 80.5px; top: 72.5px; width: 22px; height: 22px; border-width: 9px&quot;&gt;&lt;/div&gt;
+
+
+&lt;div style=&quot;left: 24.5px; top: 119.5px; border-width: 1px; width: 22px; height: 26px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 47.5px; top: 118.5px; width: 24px; height: 24px; border-width: 3px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 72.5px; top: 117.5px; width: 22px; height: 22px; border-width: 5px&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;left: 24.5px; top: 146.5px; border-width: 1px; width: 22px; height: 26px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 47.5px; top: 145.5px; width: 24px; height: 24px; border-width: 3px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 72.5px; top: 144.5px; width: 22px; height: 22px; border-width: 5px&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;left: 24.5px; top: 173.5px; border-width: 1px; width: 22px; height: 26px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 47.5px; top: 172.5px; width: 24px; height: 24px; border-width: 3px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 72.5px; top: 171.5px; width: 22px; height: 22px; border-width: 5px&quot;&gt;&lt;/div&gt;
+
+&lt;div style=&quot;left: 24.5px; top: 210.5px; border-width: 1px; width: 34px; height: 26px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 59.5px; top: 209.5px; width: 34px; height: 24px; border-width: 3px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 96.5px; top: 208.5px; width: 34px; height: 22px; border-width: 5px&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;left: 21.5px; top: 237.5px; border-width: 7px; width: 30px; height: 26px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 56.5px; top: 236.5px; width: 30px; height: 24px; border-width: 9px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 93.5px; top: 235.5px; width: 28px; height: 22px; border-width: 11px&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;left: 18.5px; top: 270.5px; border-width: 13px; width: 24px; height: 26px;&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 53.5px; top: 269.5px; width: 24px; height: 24px; border-width: 15px&quot;&gt;&lt;/div&gt;&lt;div style=&quot;left: 90.5px; top: 268.5px; width: 22px; height: 22px; border-width: 17px&quot;&gt;&lt;/div&gt;
+
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttablehidpicollapsedborderwithoddpixelwidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width.html (0 => 197524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width.html                                (rev 0)
+++ trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width.html        2016-03-03 23:55:52 UTC (rev 197524)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This test that we can position collapsed border with odd width at device pixel.&lt;/title&gt;
+&lt;style&gt;
+body {
+    margin: 20px;
+}
+
+table {
+    margin: 5px;
+    border-collapse: collapse;
+}
+
+td {
+  height: 20px;
+  width: 20px;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;table&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 1px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 2px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 3px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 4px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 5px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 6px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 7px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 8px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 9px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+&lt;table&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 1px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 3px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 5px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 1px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 3px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 5px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 1px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 3px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 5px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+&lt;table&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 1px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 3px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 5px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 7px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 9px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 11px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+    &lt;tr&gt;&lt;td style=&quot;border: 13px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 15px solid red&quot;&gt;&lt;/td&gt;&lt;td style=&quot;border: 17px solid red&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197523 => 197524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-03 23:49:18 UTC (rev 197523)
+++ trunk/Source/WebCore/ChangeLog        2016-03-03 23:55:52 UTC (rev 197524)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-03  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Subpixel rendering: Make collapsed borders painting subpixel aware.
+        https://bugs.webkit.org/show_bug.cgi?id=154980
+
+        Reviewed by David Hyatt.
+
+        This patch enables collapsed borders with odd pixel width paint on subpixel position.
+        Currently borders with odd pixels are split at integral position so that border-width: 3px;
+        paints 1px on the left(top) and 2px on the right(bottom) side. With this patch
+        we paint 1.5px on both sides(on 2x display).
+
+        Test: fast/table/hidpi-collapsed-border-with-odd-pixel-width.html
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintCollapsedBorders):
+
</ins><span class="cx"> 2016-03-03  Dave Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add support for the &quot;last&quot; value of hanging-punctuation
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (197523 => 197524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp        2016-03-03 23:49:18 UTC (rev 197523)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp        2016-03-03 23:55:52 UTC (rev 197524)
</span><span class="lines">@@ -1204,10 +1204,11 @@
</span><span class="cx">     LayoutUnit leftWidth = leftVal.width();
</span><span class="cx">     LayoutUnit rightWidth = rightVal.width();
</span><span class="cx"> 
</span><del>-    LayoutRect borderRect = LayoutRect(paintRect.x() - floorToInt(leftWidth / 2),
-        paintRect.y() - floorToInt(topWidth / 2),
-        paintRect.width() + floorToInt(leftWidth / 2) + floorToInt((rightWidth + 1) / 2),
-        paintRect.height() + floorToInt(topWidth / 2) + floorToInt((bottomWidth + 1) / 2));
</del><ins>+    float deviceScaleFactor = document().deviceScaleFactor();
+    LayoutRect borderRect = LayoutRect(paintRect.x() - floorToDevicePixel(leftWidth / 2, deviceScaleFactor),
+        paintRect.y() - floorToDevicePixel(topWidth / 2, deviceScaleFactor),
+        paintRect.width() + floorToDevicePixel(leftWidth / 2, deviceScaleFactor) + floorToDevicePixel(rightWidth / 2, deviceScaleFactor),
+        paintRect.height() + floorToDevicePixel(topWidth / 2, deviceScaleFactor) + floorToDevicePixel(bottomWidth / 2, deviceScaleFactor));
</ins><span class="cx">     
</span><span class="cx">     EBorderStyle topStyle = collapsedBorderStyle(topVal.style());
</span><span class="cx">     EBorderStyle bottomStyle = collapsedBorderStyle(bottomVal.style());
</span></span></pre>
</div>
</div>

</body>
</html>