<!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>[197627] 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/197627">197627</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-05 19:10:21 -0800 (Sat, 05 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make table collapsed borders subpixel aware.
https://bugs.webkit.org/show_bug.cgi?id=150383
Reviewed by Simon Fraser.
This patch enables authors to
- set subpixel width on collapsed borders
- and push those borders to subpixel positions.
Source/WebCore:
Test: fast/table/collapsed-border-with-odd-pixel-width.html
* rendering/RenderTable.cpp:
(WebCore::RenderTable::calcBorderStart):
(WebCore::RenderTable::calcBorderEnd):
(WebCore::RenderTable::outerBorderBefore):
(WebCore::RenderTable::outerBorderAfter):
(WebCore::RenderTable::outerBorderStart):
(WebCore::RenderTable::outerBorderEnd):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::borderHalfStart):
(WebCore::RenderTableCell::borderHalfEnd):
(WebCore::RenderTableCell::borderHalfBefore):
(WebCore::RenderTableCell::borderHalfAfter):
(WebCore::RenderTableCell::paintCollapsedBorders):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::calcOuterBorderBefore):
(WebCore::RenderTableSection::calcOuterBorderAfter):
(WebCore::RenderTableSection::calcOuterBorderStart):
(WebCore::RenderTableSection::calcOuterBorderEnd):
* rendering/style/CollapsedBorderValue.h:
(WebCore::CollapsedBorderValue::adjustedCollapsedBorderWidth):
LayoutTests:
* fast/table/collapsed-border-with-odd-pixel-width-expected.html: Added.
* fast/table/collapsed-border-with-odd-pixel-width.html: Added.
* fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasttablehidpicollapsedborderwithoddpixelwidthexpectedhtml">trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleCollapsedBorderValueh">trunk/Source/WebCore/rendering/style/CollapsedBorderValue.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttablecollapsedborderwithoddpixelwidthexpectedhtml">trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttablecollapsedborderwithoddpixelwidthhtml">trunk/LayoutTests/fast/table/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 (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/LayoutTests/ChangeLog 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-05 Zalan Bujtas <zalan@apple.com>
+
+ Make table collapsed borders subpixel aware.
+ https://bugs.webkit.org/show_bug.cgi?id=150383
+
+ Reviewed by Simon Fraser.
+
+ This patch enables authors to
+ - set subpixel width on collapsed borders
+ - and push those borders to subpixel positions.
+
+ * fast/table/collapsed-border-with-odd-pixel-width-expected.html: Added.
+ * fast/table/collapsed-border-with-odd-pixel-width.html: Added.
+ * fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html:
+
</ins><span class="cx"> 2016-03-05 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add support for processing the autofill field name out of form control elements ultimately to aid input methods
</span></span></pre></div>
<a id="trunkLayoutTestsfasttablecollapsedborderwithoddpixelwidthexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width-expected.html (0 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width-expected.html (rev 0)
+++ trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width-expected.html 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<title>This test that we can position collapsed border with odd width at device pixel.</title>
+<style>
+
+div {
+ position: absolute;
+ height: 27px;
+ width: 29px;
+ border-color: red;
+ border-style: solid;
+}
+</style>
+</head>
+<body>
+<div style="left: 25px; top: 21px; border-width: 1px"></div><div style="left: 54px; top: 20px; width: 28px; height: 26px; border-width: 2px"></div><div style="left: 84px; top: 20px; width: 28px; height: 25px; border-width: 3px"></div>
+<div style="left: 23px; top: 46px; border-width: 4px; width: 26px; height: 26px"></div><div style="left: 53px; top: 46px; width: 25px; height: 25px; border-width: 5px"></div><div style="left: 82px; top: 45px; width: 25px; height: 24px; border-width: 6px"></div>
+<div style="left: 22px; top: 74px; border-width: 7px; width: 23px; height: 24px;"></div><div style="left: 51px; top: 73px; width: 22px; height: 23px; border-width: 8px"></div><div style="left: 81px; top: 73px; width: 22px; height: 22px; border-width: 9px"></div>
+
+
+<div style="left: 25px; top: 120px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 48px; top: 119px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 73px; top: 118px; width: 22px; height: 22px; border-width: 5px"></div>
+<div style="left: 25px; top: 147px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 48px; top: 146px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 73px; top: 145px; width: 22px; height: 22px; border-width: 5px"></div>
+<div style="left: 25px; top: 174px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 48px; top: 173px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 73px; top: 172px; width: 22px; height: 22px; border-width: 5px"></div>
+
+<div style="left: 25px; top: 211px; border-width: 1px; width: 34px; height: 26px;"></div><div style="left: 60px; top: 210px; width: 34px; height: 24px; border-width: 3px"></div><div style="left: 97px; top: 209px; width: 34px; height: 22px; border-width: 5px"></div>
+<div style="left: 22px; top: 238px; border-width: 7px; width: 30px; height: 26px;"></div><div style="left: 57px; top: 237px; width: 30px; height: 24px; border-width: 9px"></div><div style="left: 94px; top: 236px; width: 28px; height: 22px; border-width: 11px"></div>
+<div style="left: 19px; top: 271px; border-width: 13px; width: 24px; height: 26px;"></div><div style="left: 54px; top: 270px; width: 24px; height: 24px; border-width: 15px"></div><div style="left: 91px; top: 269px; width: 22px; height: 22px; border-width: 17px"></div>
+
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttablecollapsedborderwithoddpixelwidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width.html (0 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width.html (rev 0)
+++ trunk/LayoutTests/fast/table/collapsed-border-with-odd-pixel-width.html 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<title>This test that we can position collapsed border with odd width at device pixel.</title>
+<style>
+body {
+ margin: 20px;
+}
+
+table {
+ margin: 5px;
+ border-collapse: collapse;
+}
+
+td {
+ height: 20px;
+ width: 20px;
+}
+</style>
+</head>
+<body>
+<table>
+ <tr><td style="border: 1px solid red"></td><td style="border: 2px solid red"></td><td style="border: 3px solid red"></td></tr>
+ <tr><td style="border: 4px solid red"></td><td style="border: 5px solid red"></td><td style="border: 6px solid red"></td></tr>
+ <tr><td style="border: 7px solid red"></td><td style="border: 8px solid red"></td><td style="border: 9px solid red"></td></tr>
+</table>
+<table>
+ <tr><td style="border: 1px solid red"></td><td style="border: 3px solid red"></td><td style="border: 5px solid red"></td></tr>
+ <tr><td style="border: 1px solid red"></td><td style="border: 3px solid red"></td><td style="border: 5px solid red"></td></tr>
+ <tr><td style="border: 1px solid red"></td><td style="border: 3px solid red"></td><td style="border: 5px solid red"></td></tr>
+</table>
+<table>
+ <tr><td style="border: 1px solid red"></td><td style="border: 3px solid red"></td><td style="border: 5px solid red"></td></tr>
+ <tr><td style="border: 7px solid red"></td><td style="border: 9px solid red"></td><td style="border: 11px solid red"></td></tr>
+ <tr><td style="border: 13px solid red"></td><td style="border: 15px solid red"></td><td style="border: 17px solid red"></td></tr>
+</table>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttablehidpicollapsedborderwithoddpixelwidthexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/LayoutTests/fast/table/hidpi-collapsed-border-with-odd-pixel-width-expected.html 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -14,17 +14,17 @@
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div style="left: 24.5px; top: 20.5px; border-width: 1px"></div><div style="left: 54px; top: 20px; width: 28.5px; height: 26.5px; border-width: 2px"></div><div style="left: 83.5px; top: 19.5px; width: 28px; height: 25.5px; border-width: 3px"></div>
-<div style="left: 23px; top: 46px; border-width: 4px; width: 26.5px; height: 26.5px"></div><div style="left: 52.5px; top: 45.5px; width: 25.5px; height: 25.5px; border-width: 5px"></div><div style="left: 82px; top: 45px; width: 25px; height: 24px; border-width: 6px"></div>
-<div style="left: 21.5px; top: 73.5px; border-width: 7px; width: 23.5px; height: 24px;"></div><div style="left: 51px; top: 73px; width: 22px; height: 23px; border-width: 8px"></div><div style="left: 80.5px; top: 72.5px; width: 22px; height: 22px; border-width: 9px"></div>
</del><ins>+<div style="left: 25px; top: 21px; border-width: 1px"></div><div style="left: 54px; top: 20.5px; width: 28.5px; height: 26px; border-width: 2px"></div><div style="left: 84px; top: 20px; width: 28px; height: 25px; border-width: 3px"></div>
+<div style="left: 23.5px; top: 46px; border-width: 4px; width: 26px; height: 26.5px"></div><div style="left: 52.5px; top: 45.5px; width: 25.5px; height: 25.5px; border-width: 5px"></div><div style="left: 82.5px; top: 45px; width: 25px; height: 24px; border-width: 6px"></div>
+<div style="left: 22px; top: 74px; border-width: 7px; width: 23px; height: 24px;"></div><div style="left: 51px; top: 73.5px; width: 22px; height: 23px; border-width: 8px"></div><div style="left: 81px; top: 73px; width: 22px; height: 22px; border-width: 9px"></div>
</ins><span class="cx">
</span><span class="cx">
</span><del>-<div style="left: 24.5px; top: 119.5px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 47.5px; top: 118.5px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 72.5px; top: 117.5px; width: 22px; height: 22px; border-width: 5px"></div>
-<div style="left: 24.5px; top: 146.5px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 47.5px; top: 145.5px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 72.5px; top: 144.5px; width: 22px; height: 22px; border-width: 5px"></div>
-<div style="left: 24.5px; top: 173.5px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 47.5px; top: 172.5px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 72.5px; top: 171.5px; width: 22px; height: 22px; border-width: 5px"></div>
</del><ins>+<div style="left: 25px; top: 120px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 48px; top: 119px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 73px; top: 118px; width: 22px; height: 22px; border-width: 5px"></div>
+<div style="left: 25px; top: 147px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 48px; top: 146px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 73px; top: 145px; width: 22px; height: 22px; border-width: 5px"></div>
+<div style="left: 25px; top: 174px; border-width: 1px; width: 22px; height: 26px;"></div><div style="left: 48px; top: 173px; width: 24px; height: 24px; border-width: 3px"></div><div style="left: 73px; top: 172px; width: 22px; height: 22px; border-width: 5px"></div>
</ins><span class="cx">
</span><del>-<div style="left: 24.5px; top: 210.5px; border-width: 1px; width: 34px; height: 26px;"></div><div style="left: 59.5px; top: 209.5px; width: 34px; height: 24px; border-width: 3px"></div><div style="left: 96.5px; top: 208.5px; width: 34px; height: 22px; border-width: 5px"></div>
-<div style="left: 21.5px; top: 237.5px; border-width: 7px; width: 30px; height: 26px;"></div><div style="left: 56.5px; top: 236.5px; width: 30px; height: 24px; border-width: 9px"></div><div style="left: 93.5px; top: 235.5px; width: 28px; height: 22px; border-width: 11px"></div>
-<div style="left: 18.5px; top: 270.5px; border-width: 13px; width: 24px; height: 26px;"></div><div style="left: 53.5px; top: 269.5px; width: 24px; height: 24px; border-width: 15px"></div><div style="left: 90.5px; top: 268.5px; width: 22px; height: 22px; border-width: 17px"></div>
</del><ins>+<div style="left: 25px; top: 211px; border-width: 1px; width: 34px; height: 26px;"></div><div style="left: 60px; top: 210px; width: 34px; height: 24px; border-width: 3px"></div><div style="left: 97px; top: 209px; width: 34px; height: 22px; border-width: 5px"></div>
+<div style="left: 22px; top: 238px; border-width: 7px; width: 30px; height: 26px;"></div><div style="left: 57px; top: 237px; width: 30px; height: 24px; border-width: 9px"></div><div style="left: 94px; top: 236px; width: 28px; height: 22px; border-width: 11px"></div>
+<div style="left: 19px; top: 271px; border-width: 13px; width: 24px; height: 26px;"></div><div style="left: 54px; top: 270px; width: 24px; height: 24px; border-width: 15px"></div><div style="left: 91px; top: 269px; width: 22px; height: 22px; border-width: 17px"></div>
</ins><span class="cx">
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -2953,8 +2953,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/154253 animations/animation-delay-changed.html [ Pass Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/155036 fast/table/table-overflow.html [ Skip ]
-
</del><span class="cx"> # Uncategorized reftest failures, uncovered once we made reftests work. Needs triage.
</span><span class="cx"> css3/font-variant-petite-caps-synthesis-coverage.html [ ImageOnlyFailure ]
</span><span class="cx"> css3/font-variant-small-caps-synthesis-coverage.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/Source/WebCore/ChangeLog 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-03-05 Zalan Bujtas <zalan@apple.com>
+
+ Make table collapsed borders subpixel aware.
+ https://bugs.webkit.org/show_bug.cgi?id=150383
+
+ Reviewed by Simon Fraser.
+
+ This patch enables authors to
+ - set subpixel width on collapsed borders
+ - and push those borders to subpixel positions.
+
+ Test: fast/table/collapsed-border-with-odd-pixel-width.html
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::calcBorderStart):
+ (WebCore::RenderTable::calcBorderEnd):
+ (WebCore::RenderTable::outerBorderBefore):
+ (WebCore::RenderTable::outerBorderAfter):
+ (WebCore::RenderTable::outerBorderStart):
+ (WebCore::RenderTable::outerBorderEnd):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::borderHalfStart):
+ (WebCore::RenderTableCell::borderHalfEnd):
+ (WebCore::RenderTableCell::borderHalfBefore):
+ (WebCore::RenderTableCell::borderHalfAfter):
+ (WebCore::RenderTableCell::paintCollapsedBorders):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::calcOuterBorderBefore):
+ (WebCore::RenderTableSection::calcOuterBorderAfter):
+ (WebCore::RenderTableSection::calcOuterBorderStart):
+ (WebCore::RenderTableSection::calcOuterBorderEnd):
+ * rendering/style/CollapsedBorderValue.h:
+ (WebCore::CollapsedBorderValue::adjustedCollapsedBorderWidth):
+
</ins><span class="cx"> 2016-03-05 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add support for processing the autofill field name out of form control elements ultimately to aid input methods
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -1117,7 +1117,7 @@
</span><span class="cx"> borderWidth = std::max(borderWidth, firstRowAdjoiningBorder.width());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return floorToInt((borderWidth + (style().isLeftToRightDirection() ? 0 : 1)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(borderWidth, document().deviceScaleFactor(), !style().isLeftToRightDirection());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTable::calcBorderEnd() const
</span><span class="lines">@@ -1172,7 +1172,7 @@
</span><span class="cx"> borderWidth = std::max(borderWidth, firstRowAdjoiningBorder.width());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return floorToInt((borderWidth + (style().isLeftToRightDirection() ? 1 : 0)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(borderWidth, document().deviceScaleFactor(), style().isLeftToRightDirection());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderTable::recalcBordersInRowDirection()
</span><span class="lines">@@ -1213,8 +1213,10 @@
</span><span class="cx"> const BorderValue& tb = style().borderBefore();
</span><span class="cx"> if (tb.style() == BHIDDEN)
</span><span class="cx"> return 0;
</span><del>- if (tb.style() > BHIDDEN)
- borderWidth = floorToInt(std::max<LayoutUnit>(borderWidth, tb.width() / 2));
</del><ins>+ if (tb.style() > BHIDDEN) {
+ LayoutUnit collapsedBorderWidth = std::max<LayoutUnit>(borderWidth, tb.width() / 2);
+ borderWidth = floorToDevicePixel(collapsedBorderWidth, document().deviceScaleFactor());
+ }
</ins><span class="cx"> return borderWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1232,8 +1234,11 @@
</span><span class="cx"> const BorderValue& tb = style().borderAfter();
</span><span class="cx"> if (tb.style() == BHIDDEN)
</span><span class="cx"> return 0;
</span><del>- if (tb.style() > BHIDDEN)
- borderWidth = floorToInt(std::max<LayoutUnit>(borderWidth, (tb.width() + 1) / 2));
</del><ins>+ if (tb.style() > BHIDDEN) {
+ float deviceScaleFactor = document().deviceScaleFactor();
+ LayoutUnit collapsedBorderWidth = std::max<LayoutUnit>(borderWidth, (tb.width() + (1 / deviceScaleFactor)) / 2);
+ borderWidth = floorToDevicePixel(collapsedBorderWidth, deviceScaleFactor);
+ }
</ins><span class="cx"> return borderWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1248,7 +1253,7 @@
</span><span class="cx"> if (tb.style() == BHIDDEN)
</span><span class="cx"> return 0;
</span><span class="cx"> if (tb.style() > BHIDDEN)
</span><del>- borderWidth = floorToInt((tb.width() + (style().isLeftToRightDirection() ? 0 : 1)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(tb.width(), document().deviceScaleFactor(), !style().isLeftToRightDirection());
</ins><span class="cx">
</span><span class="cx"> bool allHidden = true;
</span><span class="cx"> for (RenderTableSection* section = topSection(); section; section = sectionBelow(section)) {
</span><span class="lines">@@ -1275,7 +1280,7 @@
</span><span class="cx"> if (tb.style() == BHIDDEN)
</span><span class="cx"> return 0;
</span><span class="cx"> if (tb.style() > BHIDDEN)
</span><del>- borderWidth = floorToInt((tb.width() + (style().isLeftToRightDirection() ? 1 : 0)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(tb.width(), document().deviceScaleFactor(), style().isLeftToRightDirection());
</ins><span class="cx">
</span><span class="cx"> bool allHidden = true;
</span><span class="cx"> for (RenderTableSection* section = topSection(); section; section = sectionBelow(section)) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -1054,7 +1054,7 @@
</span><span class="cx"> {
</span><span class="cx"> CollapsedBorderValue border = collapsedStartBorder(DoNotIncludeBorderColor);
</span><span class="cx"> if (border.exists())
</span><del>- return floorToInt((border.width() + ((styleForCellFlow().isLeftToRightDirection() ^ outer) ? 1 : 0)) / 2); // Give the extra pixel to top and left.
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(border.width(), document().deviceScaleFactor(), styleForCellFlow().isLeftToRightDirection() ^ outer);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1062,7 +1062,7 @@
</span><span class="cx"> {
</span><span class="cx"> CollapsedBorderValue border = collapsedEndBorder(DoNotIncludeBorderColor);
</span><span class="cx"> if (border.exists())
</span><del>- return floorToInt((border.width() + ((styleForCellFlow().isLeftToRightDirection() ^ outer) ? 0 : 1)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(border.width(), document().deviceScaleFactor(), !(styleForCellFlow().isLeftToRightDirection() ^ outer));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1070,7 +1070,7 @@
</span><span class="cx"> {
</span><span class="cx"> CollapsedBorderValue border = collapsedBeforeBorder(DoNotIncludeBorderColor);
</span><span class="cx"> if (border.exists())
</span><del>- return floorToInt((border.width() + ((styleForCellFlow().isFlippedBlocksWritingMode() ^ outer) ? 0 : 1)) / 2); // Give the extra pixel to top and left.
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(border.width(), document().deviceScaleFactor(), !(styleForCellFlow().isFlippedBlocksWritingMode() ^ outer));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1078,7 +1078,7 @@
</span><span class="cx"> {
</span><span class="cx"> CollapsedBorderValue border = collapsedAfterBorder(DoNotIncludeBorderColor);
</span><span class="cx"> if (border.exists())
</span><del>- return floorToInt((border.width() + ((styleForCellFlow().isFlippedBlocksWritingMode() ^ outer) ? 1 : 0)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(border.width(), document().deviceScaleFactor(), styleForCellFlow().isFlippedBlocksWritingMode() ^ outer);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1205,20 +1205,25 @@
</span><span class="cx"> LayoutUnit rightWidth = rightVal.width();
</span><span class="cx">
</span><span class="cx"> float deviceScaleFactor = document().deviceScaleFactor();
</span><del>- 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));
</del><ins>+ LayoutUnit leftHalfCollapsedBorder = CollapsedBorderValue::adjustedCollapsedBorderWidth(leftWidth , deviceScaleFactor, false);
+ LayoutUnit topHalfCollapsedBorder = CollapsedBorderValue::adjustedCollapsedBorderWidth(topWidth, deviceScaleFactor, false);
+ LayoutUnit righHalftCollapsedBorder = CollapsedBorderValue::adjustedCollapsedBorderWidth(rightWidth, deviceScaleFactor, true);
+ LayoutUnit bottomHalfCollapsedBorder = CollapsedBorderValue::adjustedCollapsedBorderWidth(bottomWidth, deviceScaleFactor, true);
</ins><span class="cx">
</span><ins>+ LayoutRect borderRect = LayoutRect(paintRect.x() - leftHalfCollapsedBorder,
+ paintRect.y() - topHalfCollapsedBorder,
+ paintRect.width() + leftHalfCollapsedBorder + righHalftCollapsedBorder,
+ paintRect.height() + topHalfCollapsedBorder + bottomHalfCollapsedBorder);
+
</ins><span class="cx"> EBorderStyle topStyle = collapsedBorderStyle(topVal.style());
</span><span class="cx"> EBorderStyle bottomStyle = collapsedBorderStyle(bottomVal.style());
</span><span class="cx"> EBorderStyle leftStyle = collapsedBorderStyle(leftVal.style());
</span><span class="cx"> EBorderStyle rightStyle = collapsedBorderStyle(rightVal.style());
</span><span class="cx">
</span><del>- bool renderTop = topStyle > BHIDDEN && !topVal.isTransparent() && floorToInt(topWidth);
- bool renderBottom = bottomStyle > BHIDDEN && !bottomVal.isTransparent() && floorToInt(bottomWidth);
- bool renderLeft = leftStyle > BHIDDEN && !leftVal.isTransparent() && floorToInt(leftWidth);
- bool renderRight = rightStyle > BHIDDEN && !rightVal.isTransparent() && floorToInt(rightWidth);
</del><ins>+ bool renderTop = topStyle > BHIDDEN && !topVal.isTransparent() && floorToDevicePixel(topWidth, deviceScaleFactor);
+ bool renderBottom = bottomStyle > BHIDDEN && !bottomVal.isTransparent() && floorToDevicePixel(bottomWidth, deviceScaleFactor);
+ bool renderLeft = leftStyle > BHIDDEN && !leftVal.isTransparent() && floorToDevicePixel(leftWidth, deviceScaleFactor);
+ bool renderRight = rightStyle > BHIDDEN && !rightVal.isTransparent() && floorToDevicePixel(rightWidth, deviceScaleFactor);
</ins><span class="cx">
</span><span class="cx"> // We never paint diagonals at the joins. We simply let the border with the highest
</span><span class="cx"> // precedence paint on top of borders with lower precedence.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -759,8 +759,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (allHidden)
</span><span class="cx"> return -1;
</span><del>-
- return floorToInt(borderWidth / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(borderWidth, document().deviceScaleFactor(), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableSection::calcOuterBorderAfter() const
</span><span class="lines">@@ -810,8 +809,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (allHidden)
</span><span class="cx"> return -1;
</span><del>-
- return floorToInt((borderWidth + 1) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(borderWidth, document().deviceScaleFactor(), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableSection::calcOuterBorderStart() const
</span><span class="lines">@@ -854,8 +852,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (allHidden)
</span><span class="cx"> return -1;
</span><del>-
- return floorToInt((borderWidth + (table()->style().isLeftToRightDirection() ? 0 : 1)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(borderWidth, document().deviceScaleFactor(), !table()->style().isLeftToRightDirection());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableSection::calcOuterBorderEnd() const
</span><span class="lines">@@ -898,8 +895,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (allHidden)
</span><span class="cx"> return -1;
</span><del>-
- return floorToInt((borderWidth + (table()->style().isLeftToRightDirection() ? 1 : 0)) / 2);
</del><ins>+ return CollapsedBorderValue::adjustedCollapsedBorderWidth(borderWidth, document().deviceScaleFactor(), table()->style().isLeftToRightDirection());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderTableSection::recalcOuterBorder()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleCollapsedBorderValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/CollapsedBorderValue.h (197626 => 197627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/CollapsedBorderValue.h 2016-03-06 02:17:29 UTC (rev 197626)
+++ trunk/Source/WebCore/rendering/style/CollapsedBorderValue.h 2016-03-06 03:10:21 UTC (rev 197627)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> return width() == o.width() && style() == o.style() && precedence() == o.precedence();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static LayoutUnit adjustedCollapsedBorderWidth(float borderWidth, float deviceScaleFactor, bool roundUp);
+
</ins><span class="cx"> private:
</span><span class="cx"> LayoutUnit m_width;
</span><span class="cx"> RGBA32 m_color { 0 };
</span><span class="lines">@@ -71,6 +73,12 @@
</span><span class="cx"> unsigned m_transparent : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline LayoutUnit CollapsedBorderValue::adjustedCollapsedBorderWidth(float borderWidth, float deviceScaleFactor, bool roundUp)
+{
+ float halfCollapsedBorderWidth = (borderWidth + (roundUp ? (1 / deviceScaleFactor) : 0)) / 2;
+ return floorToDevicePixel(halfCollapsedBorderWidth, deviceScaleFactor);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // CollapsedBorderValue_h
</span></span></pre>
</div>
</div>
</body>
</html>