<!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>[162553] 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/162553">162553</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 14:03:29 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel Layout: SimpleLineLayout needs more position rounding to match InlineFlowBox layout.
https://bugs.webkit.org/show_bug.cgi?id=127404
Reviewed by Antti Koivisto.
In order to produce a CSS pixel perfect layout, SimpleLineLayout needs to
round line positions to CSS (integral) position similarly to InlineFlowBox.
Source/WebCore:
Existing tests cover it.
* rendering/SimpleLineLayoutResolver.h:
(WebCore::SimpleLineLayout::RunResolver::Run::rect):
(WebCore::SimpleLineLayout::RunResolver::Run::baseline):
LayoutTests:
* platform/mac/css1/box_properties/padding-expected.txt:
* platform/mac/css1/box_properties/padding_top-expected.txt:
* platform/mac/css1/formatting_model/vertical_formatting-expected.txt:
* platform/mac/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt:
* platform/mac/css2.1/t0804-c5510-padn-00-b-ag-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt:
* platform/mac/fast/css/empty-pseudo-class-expected.txt:
* platform/mac/fast/css/fieldset-display-row-expected.txt:
* platform/mac/fast/css/first-child-pseudo-class-expected.txt:
* platform/mac/fast/css/last-child-pseudo-class-expected.txt:
* platform/mac/fast/css/only-child-pseudo-class-expected.txt:
* platform/mac/fast/repaint/reflection-redraw-expected.txt:
* platform/mac/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.png: Removed.
* platform/mac/fast/table/dynamic-caption-add-remove-before-child-expected.txt:
* platform/mac/fast/table/multiple-captions-display-expected.txt:
* platform/mac/tables/mozilla/marvin/body_col-expected.txt:
* platform/mac/tables/mozilla/marvin/x_th_valign_baseline-expected.txt:
* platform/mac/tables/mozilla/other/body_col-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug10140-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.txt:
* platform/mac/tables/mozilla_expected_failures/core/captions3-expected.txt:
* platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss1box_propertiespaddingexpectedtxt">trunk/LayoutTests/platform/mac/css1/box_properties/padding-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss1box_propertiespadding_topexpectedtxt">trunk/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss1formatting_modelvertical_formattingexpectedtxt">trunk/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss21t080301c411vtmrgn00bexpectedtxt">trunk/LayoutTests/platform/mac/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss21t0804c5510padn00bagexpectedtxt">trunk/LayoutTests/platform/mac/css2.1/t0804-c5510-padn-00-b-ag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss21t0905c414fltwrap00eexpectedtxt">trunk/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssemptypseudoclassexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssfieldsetdisplayrowexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/fieldset-display-row-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssfirstchildpseudoclassexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsslastchildpseudoclassexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssonlychildpseudoclassexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintreflectionredrawexpectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/reflection-redraw-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttabledynamiccaptionaddremovebeforechildexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/dynamic-caption-add-remove-before-child-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttablemultiplecaptionsdisplayexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/multiple-captions-display-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinbody_colexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_th_valign_baselineexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_valign_baseline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillaotherbody_colexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozilla_expected_failuresbugsbug10140expectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10140-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozilla_expected_failuresbugsbug10216expectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozilla_expected_failurescorecaptions3expectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/captions3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozilla_expected_failuresothertest4expectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutResolverh">trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/mac/fast/shapes/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/ChangeLog 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-01-22 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel Layout: SimpleLineLayout needs more position rounding to match InlineFlowBox layout.
+ https://bugs.webkit.org/show_bug.cgi?id=127404
+
+ Reviewed by Antti Koivisto.
+
+ In order to produce a CSS pixel perfect layout, SimpleLineLayout needs to
+ round line positions to CSS (integral) position similarly to InlineFlowBox.
+
+ * platform/mac/css1/box_properties/padding-expected.txt:
+ * platform/mac/css1/box_properties/padding_top-expected.txt:
+ * platform/mac/css1/formatting_model/vertical_formatting-expected.txt:
+ * platform/mac/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt:
+ * platform/mac/css2.1/t0804-c5510-padn-00-b-ag-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt:
+ * platform/mac/fast/css/empty-pseudo-class-expected.txt:
+ * platform/mac/fast/css/fieldset-display-row-expected.txt:
+ * platform/mac/fast/css/first-child-pseudo-class-expected.txt:
+ * platform/mac/fast/css/last-child-pseudo-class-expected.txt:
+ * platform/mac/fast/css/only-child-pseudo-class-expected.txt:
+ * platform/mac/fast/repaint/reflection-redraw-expected.txt:
+ * platform/mac/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.png: Removed.
+ * platform/mac/fast/table/dynamic-caption-add-remove-before-child-expected.txt:
+ * platform/mac/fast/table/multiple-captions-display-expected.txt:
+ * platform/mac/tables/mozilla/marvin/body_col-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_th_valign_baseline-expected.txt:
+ * platform/mac/tables/mozilla/other/body_col-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug10140-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/core/captions3-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt:
+
</ins><span class="cx"> 2014-01-22 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: fast/js/dfg-* typed array tests frequently time out on debug bots
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss1box_propertiespaddingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css1/box_properties/padding-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css1/box_properties/padding-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/css1/box_properties/padding-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> text run at (80,98) width 29: "test. "
</span><span class="cx"> text run at (109,98) width 464: "Both the content background and the padding should be aqua (light blue)."
</span><span class="cx"> RenderBlock {P} at (0,651) size 769x457 [bgcolor=#00FFFF]
</span><del>- RenderText {#text} at (192,192) size 380x73
</del><ins>+ RenderText {#text} at (192,192) size 380x72
</ins><span class="cx"> text run at (192,192) width 380: "This element should have an overall padding of 25%, which"
</span><span class="cx"> text run at (192,210) width 377: "is calculated with respect to the width of the parent element."
</span><span class="cx"> text run at (192,228) width 354: "Both the content background and the padding should be"
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> text run at (80,98) width 45: "to test. "
</span><span class="cx"> text run at (125,98) width 464: "Both the content background and the padding should be aqua (light blue)."
</span><span class="cx"> RenderBlock {P} at (4,500) size 747x446 [bgcolor=#00FFFF]
</span><del>- RenderText {#text} at (186,186) size 363x73
- text run at (186,186) width 337: "This element should have an overall padding of 25%,"
- text run at (186,204) width 363: "which is calculated with respect to the width of the parent"
- text run at (186,222) width 58: "element. "
- text run at (243,222) width 289: "Both the content background and the padding"
- text run at (186,240) width 173: "should be aqua (light blue)."
</del><ins>+ RenderText {#text} at (186,187) size 363x72
+ text run at (186,187) width 337: "This element should have an overall padding of 25%,"
+ text run at (186,205) width 363: "which is calculated with respect to the width of the parent"
+ text run at (186,223) width 58: "element. "
+ text run at (243,223) width 289: "Both the content background and the padding"
+ text run at (186,241) width 173: "should be aqua (light blue)."
</ins><span class="cx"> RenderBlock {P} at (4,961) size 747x37 [bgcolor=#00FFFF]
</span><span class="cx"> RenderText {#text} at (0,0) size 724x36
</span><span class="cx"> text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. "
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss1box_propertiespadding_topexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> text run at (590,80) width 104: "Both the content"
</span><span class="cx"> text run at (0,98) width 356: "background and the padding should be aqua (light blue)."
</span><span class="cx"> RenderBlock {P} at (0,498) size 769x229 [bgcolor=#00FFFF]
</span><del>- RenderText {#text} at (0,192) size 763x37
</del><ins>+ RenderText {#text} at (0,192) size 763x36
</ins><span class="cx"> text run at (0,192) width 732: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. "
</span><span class="cx"> text run at (732,192) width 31: "Both"
</span><span class="cx"> text run at (0,210) width 433: "the content background and the padding should be aqua (light blue). "
</span><span class="lines">@@ -81,10 +81,10 @@
</span><span class="cx"> text run at (590,80) width 104: "Both the content"
</span><span class="cx"> text run at (0,98) width 356: "background and the padding should be aqua (light blue)."
</span><span class="cx"> RenderBlock {P} at (4,347) size 747x223 [bgcolor=#00FFFF]
</span><del>- RenderText {#text} at (0,186) size 732x37
- text run at (0,186) width 728: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element."
- text run at (0,204) width 468: "Both the content background and the padding should be aqua (light blue). "
- text run at (468,204) width 264: "This will require extra text in order to test."
</del><ins>+ RenderText {#text} at (0,187) size 732x36
+ text run at (0,187) width 728: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element."
+ text run at (0,205) width 468: "Both the content background and the padding should be aqua (light blue). "
+ text run at (468,205) width 264: "This will require extra text in order to test."
</ins><span class="cx"> RenderBlock {P} at (4,585) size 747x37 [bgcolor=#00FFFF]
</span><span class="cx"> RenderText {#text} at (0,0) size 669x36
</span><span class="cx"> text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. "
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss1formatting_modelvertical_formattingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> text run at (0,0) width 726: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"
</span><span class="cx"> text run at (0,18) width 456: "negative margin with the largest absolute value of the margins collapsed."
</span><span class="cx"> RenderBlock {P} at (0,1042) size 769x75
</span><del>- RenderText {#text} at (0,37) size 765x37
- text run at (0,37) width 765: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the"
- text run at (0,55) width 181: "one below it and to the right."
</del><ins>+ RenderText {#text} at (0,38) size 765x36
+ text run at (0,38) width 765: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the"
+ text run at (0,56) width 181: "one below it and to the right."
</ins><span class="cx"> RenderBlock (floating) {P} at (0,1192) size 385x55
</span><span class="cx"> RenderText {#text} at (0,0) size 382x54
</span><span class="cx"> text run at (0,0) width 382: "There should be two centimeters between this paragraph and"
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> text run at (555,0) width 195: "Padding does not collapse, and"
</span><span class="cx"> text run at (0,18) width 234: "there is 1cm of padding on each side."
</span><span class="cx"> RenderBlock {P} at (0,1336) size 769x56
</span><del>- RenderText {#text} at (0,37) size 167x19
- text run at (0,37) width 167: "This is the next paragraph."
</del><ins>+ RenderText {#text} at (0,38) size 167x18
+ text run at (0,38) width 167: "This is the next paragraph."
</ins><span class="cx"> RenderTable {TABLE} at (0,1407) size 769x1064 [border: (1px outset #808080)]
</span><span class="cx"> RenderTableSection {TBODY} at (1,1) size 767x1061
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 767x26
</span><span class="lines">@@ -149,9 +149,9 @@
</span><span class="cx"> text run at (0,0) width 726: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"
</span><span class="cx"> text run at (0,18) width 456: "negative margin with the largest absolute value of the margins collapsed."
</span><span class="cx"> RenderBlock {P} at (4,681) size 747x75
</span><del>- RenderText {#text} at (0,37) size 742x37
- text run at (0,37) width 742: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and"
- text run at (0,55) width 204: "the one below it and to the right."
</del><ins>+ RenderText {#text} at (0,38) size 742x36
+ text run at (0,38) width 742: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and"
+ text run at (0,56) width 204: "the one below it and to the right."
</ins><span class="cx"> RenderBlock (floating) {P} at (4,831) size 374x55
</span><span class="cx"> RenderText {#text} at (0,0) size 355x54
</span><span class="cx"> text run at (0,0) width 355: "There should be two centimeters between this paragraph"
</span><span class="lines">@@ -168,5 +168,5 @@
</span><span class="cx"> text run at (555,0) width 168: "Padding does not collapse,"
</span><span class="cx"> text run at (0,18) width 261: "and there is 1cm of padding on each side."
</span><span class="cx"> RenderBlock {P} at (4,975) size 747x56
</span><del>- RenderText {#text} at (0,37) size 167x19
- text run at (0,37) width 167: "This is the next paragraph."
</del><ins>+ RenderText {#text} at (0,38) size 167x18
+ text run at (0,38) width 167: "This is the next paragraph."
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss21t080301c411vtmrgn00bexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 5x18
</span><span class="cx"> text run at (0,0) width 5: "-"
</span><span class="cx"> RenderBlock {P} at (3,542) size 80x57 [bgcolor=#00FF00]
</span><del>- RenderText {#text} at (0,37) size 5x19
- text run at (0,37) width 5: "-"
</del><ins>+ RenderText {#text} at (0,38) size 5x18
+ text run at (0,38) width 5: "-"
</ins><span class="cx"> RenderBlock (floating) {P} at (3,674) size 40x19 [bgcolor=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,0) size 5x18
</span><span class="cx"> text run at (0,0) width 5: "-"
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 5x18
</span><span class="cx"> text run at (0,0) width 5: "-"
</span><span class="cx"> RenderBlock {P} at (3,748) size 80x56 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,37) size 5x19
- text run at (0,37) width 5: "-"
</del><ins>+ RenderText {#text} at (0,38) size 5x18
+ text run at (0,38) width 5: "-"
</ins><span class="cx"> RenderTableCell {TD} at (90,2) size 86x807 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderBlock {DIV} at (3,3) size 80x18 [bgcolor=#FFFF00]
</span><span class="cx"> RenderText {#text} at (0,0) size 5x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss21t0804c5510padn00bagexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css2.1/t0804-c5510-padn-00-b-ag-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css2.1/t0804-c5510-padn-00-b-ag-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/css2.1/t0804-c5510-padn-00-b-ag-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -28,5 +28,5 @@
</span><span class="cx"> RenderText {#text} at (24,24) size 90x10
</span><span class="cx"> text run at (24,24) width 90: "x x x x x"
</span><span class="cx"> RenderBlock {P} at (0,272) size 138x58 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (23,23) size 91x11
- text run at (23,23) width 91: "x x x x x"
</del><ins>+ RenderText {#text} at (23,24) size 91x10
+ text run at (23,24) width 91: "x x x x x"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss21t0905c414fltwrap00eexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-00-e-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -8,10 +8,10 @@
</span><span class="cx"> text run at (0,0) width 263: "The word \"fail\" should not appear below."
</span><span class="cx"> RenderBlock {DIV} at (16,34) size 240x127 [color=#FFFFFF] [bgcolor=#FFFFFF]
</span><span class="cx"> RenderBlock (floating) {P} at (0,0) size 44x19 [color=#000080]
</span><del>- RenderText {#text} at (0,0) size 44x19
</del><ins>+ RenderText {#text} at (0,0) size 44x18
</ins><span class="cx"> text run at (0,0) width 44: "TEST:"
</span><span class="cx"> RenderBlock (floating) {P} at (0,18) size 240x19 [color=#00FFFF] [bgcolor=#008080]
</span><del>- RenderText {#text} at (100,0) size 40x19
</del><ins>+ RenderText {#text} at (100,0) size 40x18
</ins><span class="cx"> text run at (100,0) width 40: "PASS"
</span><span class="cx"> RenderText {#text} at (43,0) size 236x126
</span><span class="cx"> text run at (43,0) width 188: "fail fail fail fail fail fail fail fail"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssemptypseudoclassexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -75,17 +75,17 @@
</span><span class="cx"> RenderText {#text} at (12,12) size 4x17
</span><span class="cx"> text run at (12,12) width 4: "."
</span><span class="cx"> RenderBlock {PRE} at (16,71) size 584x103 [bgcolor=#FFFFFF]
</span><del>- RenderText {#text} at (6,6) size 225x91
- text run at (6,6) width 65: ":empty {"
- text run at (70,6) width 1: " "
- text run at (6,21) width 9: "}"
- text run at (14,21) width 1: " "
- text run at (6,36) width 1: " "
- text run at (6,51) width 49: "<div> "
- text run at (54,51) width 1: " "
- text run at (6,66) width 225: " How about regular text..."
- text run at (230,66) width 1: " "
- text run at (6,81) width 49: "</div>"
</del><ins>+ RenderText {#text} at (6,7) size 225x90
+ text run at (6,7) width 65: ":empty {"
+ text run at (70,7) width 1: " "
+ text run at (6,22) width 9: "}"
+ text run at (14,22) width 1: " "
+ text run at (6,37) width 1: " "
+ text run at (6,52) width 49: "<div> "
+ text run at (54,52) width 1: " "
+ text run at (6,67) width 225: " How about regular text..."
+ text run at (230,67) width 1: " "
+ text run at (6,82) width 49: "</div>"
</ins><span class="cx"> RenderBlock {P} at (16,190) size 584x18
</span><span class="cx"> RenderText {#text} at (0,0) size 533x17
</span><span class="cx"> text run at (0,0) width 533: "The CSS selector should not match the div element, because it is not empty"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssfieldsetdisplayrowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/fieldset-display-row-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/fieldset-display-row-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/css/fieldset-display-row-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -4,5 +4,5 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx"> RenderFieldSet {FIELDSET} at (2,0) size 780x38 [border: (2px groove #C0C0C0)]
</span><del>- RenderText {#text} at (14,7) size 375x19
- text run at (14,7) width 375: "If you can see this fieldset without crashing, then all is well."
</del><ins>+ RenderText {#text} at (14,8) size 375x18
+ text run at (14,8) width 375: "If you can see this fieldset without crashing, then all is well."
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssfirstchildpseudoclassexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -98,19 +98,19 @@
</span><span class="cx"> text run at (0,0) width 4: "."
</span><span class="cx"> RenderBlock {DIV} at (0,18) size 584x24 [bgcolor=#009900]
</span><span class="cx"> RenderBlock {PRE} at (16,71) size 584x118 [bgcolor=#FFFFFF]
</span><del>- RenderText {#text} at (6,6) size 225x106
- text run at (6,6) width 145: "div :first-child {"
- text run at (150,6) width 1: " "
- text run at (6,21) width 9: "}"
- text run at (14,21) width 1: " "
- text run at (6,36) width 1: " "
- text run at (6,51) width 49: "<div> "
- text run at (54,51) width 1: " "
- text run at (6,66) width 225: " How about regular text..."
- text run at (230,66) width 1: " "
- text run at (6,81) width 113: " <div></div>"
- text run at (118,81) width 1: " "
- text run at (6,96) width 49: "</div>"
</del><ins>+ RenderText {#text} at (6,7) size 225x105
+ text run at (6,7) width 145: "div :first-child {"
+ text run at (150,7) width 1: " "
+ text run at (6,22) width 9: "}"
+ text run at (14,22) width 1: " "
+ text run at (6,37) width 1: " "
+ text run at (6,52) width 49: "<div> "
+ text run at (54,52) width 1: " "
+ text run at (6,67) width 225: " How about regular text..."
+ text run at (230,67) width 1: " "
+ text run at (6,82) width 113: " <div></div>"
+ text run at (118,82) width 1: " "
+ text run at (6,97) width 49: "</div>"
</ins><span class="cx"> RenderBlock {P} at (16,205) size 584x54
</span><span class="cx"> RenderText {#text} at (0,0) size 567x53
</span><span class="cx"> text run at (0,0) width 567: "The CSS selector should match the inner div element, because it is the first child"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsslastchildpseudoclassexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -98,19 +98,19 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 4x17
</span><span class="cx"> text run at (0,0) width 4: "."
</span><span class="cx"> RenderBlock {PRE} at (16,71) size 584x118 [bgcolor=#FFFFFF]
</span><del>- RenderText {#text} at (6,6) size 225x106
- text run at (6,6) width 137: "div :last-child {"
- text run at (142,6) width 1: " "
- text run at (6,21) width 9: "}"
- text run at (14,21) width 1: " "
- text run at (6,36) width 1: " "
- text run at (6,51) width 49: "<div> "
- text run at (54,51) width 1: " "
- text run at (6,66) width 113: " <div></div>"
- text run at (118,66) width 1: " "
- text run at (6,81) width 225: " How about regular text..."
- text run at (230,81) width 1: " "
- text run at (6,96) width 49: "</div>"
</del><ins>+ RenderText {#text} at (6,7) size 225x105
+ text run at (6,7) width 137: "div :last-child {"
+ text run at (142,7) width 1: " "
+ text run at (6,22) width 9: "}"
+ text run at (14,22) width 1: " "
+ text run at (6,37) width 1: " "
+ text run at (6,52) width 49: "<div> "
+ text run at (54,52) width 1: " "
+ text run at (6,67) width 113: " <div></div>"
+ text run at (118,67) width 1: " "
+ text run at (6,82) width 225: " How about regular text..."
+ text run at (230,82) width 1: " "
+ text run at (6,97) width 49: "</div>"
</ins><span class="cx"> RenderBlock {P} at (16,205) size 584x54
</span><span class="cx"> RenderText {#text} at (0,0) size 567x53
</span><span class="cx"> text run at (0,0) width 567: "The CSS selector should match the inner div element, because it is the last child"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssonlychildpseudoclassexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -73,19 +73,19 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 4x17
</span><span class="cx"> text run at (0,0) width 4: "."
</span><span class="cx"> RenderBlock {PRE} at (16,71) size 584x118 [bgcolor=#FFFFFF]
</span><del>- RenderText {#text} at (6,6) size 225x106
- text run at (6,6) width 137: "div :only-child {"
- text run at (142,6) width 1: " "
- text run at (6,21) width 9: "}"
- text run at (14,21) width 1: " "
- text run at (6,36) width 1: " "
- text run at (6,51) width 41: "<div>"
- text run at (46,51) width 1: " "
- text run at (6,66) width 113: " <div></div>"
- text run at (118,66) width 1: " "
- text run at (6,81) width 225: " How about regular text..."
- text run at (230,81) width 1: " "
- text run at (6,96) width 49: "</div>"
</del><ins>+ RenderText {#text} at (6,7) size 225x105
+ text run at (6,7) width 137: "div :only-child {"
+ text run at (142,7) width 1: " "
+ text run at (6,22) width 9: "}"
+ text run at (14,22) width 1: " "
+ text run at (6,37) width 1: " "
+ text run at (6,52) width 41: "<div>"
+ text run at (46,52) width 1: " "
+ text run at (6,67) width 113: " <div></div>"
+ text run at (118,67) width 1: " "
+ text run at (6,82) width 225: " How about regular text..."
+ text run at (230,82) width 1: " "
+ text run at (6,97) width 49: "</div>"
</ins><span class="cx"> RenderBlock {P} at (16,205) size 584x36
</span><span class="cx"> RenderText {#text} at (0,0) size 572x35
</span><span class="cx"> text run at (0,0) width 572: "The CSS selector should match the inner div element, because it is the only child"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintreflectionredrawexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/reflection-redraw-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/reflection-redraw-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/repaint/reflection-redraw-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -7,28 +7,28 @@
</span><span class="cx"> layer at (293,130) size 150x100
</span><span class="cx"> RenderBlock (positioned) {DIV} at (285,10) size 150x100 [bgcolor=#808080] [border: (1px solid #000000)]
</span><span class="cx"> RenderBlock {P} at (11,27) size 128x54 [color=#008000]
</span><del>- RenderText {#text} at (12,0) size 126x54
</del><ins>+ RenderText {#text} at (12,0) size 125x54
</ins><span class="cx"> text run at (12,0) width 104: "The color of this"
</span><span class="cx"> text run at (1,18) width 126: "text in the reflection"
</span><span class="cx"> text run at (14,36) width 100: "should be green"
</span><span class="cx"> layer at (218,240) size 150x100
</span><span class="cx"> RenderBlock (positioned) {DIV} at (210,120) size 150x100 [bgcolor=#808080] [border: (1px solid #000000)]
</span><span class="cx"> RenderBlock {P} at (11,27) size 128x54 [color=#008000]
</span><del>- RenderText {#text} at (12,0) size 126x54
</del><ins>+ RenderText {#text} at (12,0) size 125x54
</ins><span class="cx"> text run at (12,0) width 104: "The color of this"
</span><span class="cx"> text run at (1,18) width 126: "text in the reflection"
</span><span class="cx"> text run at (14,36) width 100: "should be green"
</span><span class="cx"> layer at (368,240) size 150x100
</span><span class="cx"> RenderBlock (positioned) {DIV} at (360,120) size 150x100 [bgcolor=#808080] [border: (1px solid #000000)]
</span><span class="cx"> RenderBlock {P} at (11,27) size 128x54 [color=#008000]
</span><del>- RenderText {#text} at (12,0) size 126x54
</del><ins>+ RenderText {#text} at (12,0) size 125x54
</ins><span class="cx"> text run at (12,0) width 104: "The color of this"
</span><span class="cx"> text run at (1,18) width 126: "text in the reflection"
</span><span class="cx"> text run at (14,36) width 100: "should be green"
</span><span class="cx"> layer at (293,350) size 150x100
</span><span class="cx"> RenderBlock (positioned) {DIV} at (285,230) size 150x100 [bgcolor=#808080] [border: (1px solid #000000)]
</span><span class="cx"> RenderBlock {P} at (11,27) size 128x54 [color=#008000]
</span><del>- RenderText {#text} at (12,0) size 126x54
</del><ins>+ RenderText {#text} at (12,0) size 125x54
</ins><span class="cx"> text run at (12,0) width 104: "The color of this"
</span><span class="cx"> text run at (1,18) width 126: "text in the reflection"
</span><span class="cx"> text run at (14,36) width 100: "should be green"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttabledynamiccaptionaddremovebeforechildexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/dynamic-caption-add-remove-before-child-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/dynamic-caption-add-remove-before-child-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/table/dynamic-caption-add-remove-before-child-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> RenderBody {body} at (8,8) size 784x72
</span><span class="cx"> RenderTable {table} at (0,0) size 46x72
</span><span class="cx"> RenderBlock {caption} at (0,0) size 46x72
</span><del>- RenderText {#text} at (1,0) size 46x72
</del><ins>+ RenderText {#text} at (1,0) size 47x72
</ins><span class="cx"> text run at (1,0) width 44: "PASS:"
</span><span class="cx"> text run at (0,18) width 46: "Text in"
</span><span class="cx"> text run at (0,36) width 46: "caption"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttablemultiplecaptionsdisplayexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/multiple-captions-display-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/multiple-captions-display-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/fast/table/multiple-captions-display-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> RenderBlock {caption} at (0,126) size 126x0
</span><span class="cx"> layer at (8,218) size 126x54
</span><span class="cx"> RenderBlock {caption} at (0,210) size 126x54
</span><del>- RenderText {#text} at (25,0) size 116x54
</del><ins>+ RenderText {#text} at (25,0) size 117x54
</ins><span class="cx"> text run at (25,0) width 76: "PASS: First"
</span><span class="cx"> text run at (5,18) width 116: "Caption aligned to"
</span><span class="cx"> text run at (29,36) width 68: "the bottom"
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> text run at (0,0) width 230: "PASS: Caption with a fixed position"
</span><span class="cx"> layer at (8,8) size 126x36
</span><span class="cx"> RenderBlock {caption} at (0,0) size 126x36
</span><del>- RenderText {#text} at (14,0) size 102x36
</del><ins>+ RenderText {#text} at (14,0) size 103x36
</ins><span class="cx"> text run at (14,0) width 98: "PASS: Caption"
</span><span class="cx"> text run at (12,18) width 102: "with opacity 0.7"
</span><span class="cx"> layer at (10,196) size 331x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinbody_colexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> RenderTableSection {TBODY} at (2,2) size 155x152
</span><span class="cx"> RenderTableRow {TR} at (0,2) size 155x40
</span><span class="cx"> RenderTableCell {TH} at (2,2) size 49x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><del>- RenderText {#text} at (15,2) size 37x36
</del><ins>+ RenderText {#text} at (15,2) size 36x36
</ins><span class="cx"> text run at (15,2) width 19: "La"
</span><span class="cx"> text run at (6,20) width 37: "Mesa"
</span><span class="cx"> RenderTableCell {TD} at (53,11) size 100x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> text run at (2,2) width 12: "X"
</span><span class="cx"> RenderTableRow {TR} at (0,44) size 155x40
</span><span class="cx"> RenderTableCell {TH} at (2,44) size 49x40 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><del>- RenderText {#text} at (17,2) size 43x36
</del><ins>+ RenderText {#text} at (17,2) size 42x36
</ins><span class="cx"> text run at (17,2) width 15: "El"
</span><span class="cx"> text run at (3,20) width 43: "Cajon"
</span><span class="cx"> RenderTableCell {TD} at (53,53) size 100x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_th_valign_baselineexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_valign_baseline-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_valign_baseline-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_valign_baseline-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> RenderTableSection (anonymous) at (1,1) size 782x238
</span><span class="cx"> RenderTableRow {tr} at (0,2) size 782x234
</span><span class="cx"> RenderTableCell {th} at (2,24) size 214x94 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><del>- RenderText {#text} at (12,2) size 206x90
</del><ins>+ RenderText {#text} at (12,2) size 207x90
</ins><span class="cx"> text run at (12,2) width 190: "Compare the baseline of the"
</span><span class="cx"> text run at (4,20) width 76: "first line of "
</span><span class="cx"> text run at (80,20) width 130: "text in this cell with"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillaotherbody_colexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> RenderTableSection {TBODY} at (2,2) size 155x152
</span><span class="cx"> RenderTableRow {TR} at (0,2) size 155x40
</span><span class="cx"> RenderTableCell {TH} at (2,2) size 49x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><del>- RenderText {#text} at (15,2) size 37x36
</del><ins>+ RenderText {#text} at (15,2) size 36x36
</ins><span class="cx"> text run at (15,2) width 19: "La"
</span><span class="cx"> text run at (6,20) width 37: "Mesa"
</span><span class="cx"> RenderTableCell {TD} at (53,11) size 100x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> text run at (2,2) width 12: "X"
</span><span class="cx"> RenderTableRow {TR} at (0,44) size 155x40
</span><span class="cx"> RenderTableCell {TH} at (2,44) size 49x40 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><del>- RenderText {#text} at (17,2) size 43x36
</del><ins>+ RenderText {#text} at (17,2) size 42x36
</ins><span class="cx"> text run at (17,2) width 15: "El"
</span><span class="cx"> text run at (3,20) width 43: "Cajon"
</span><span class="cx"> RenderTableCell {TD} at (53,53) size 100x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozilla_expected_failuresbugsbug10140expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10140-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10140-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10140-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,1196) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (20,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,1322) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (20,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,2290) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (0,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (15,2416) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (0,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozilla_expected_failuresbugsbug10216expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> text run at (2,2) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,572) size 87x107 [border: (1px outset #808080)]
</span><span class="cx"> RenderBlock {CAPTION} at (0,0) size 87x54
</span><del>- RenderText {#text} at (9,0) size 87x54
</del><ins>+ RenderText {#text} at (9,0) size 88x54
</ins><span class="cx"> text run at (9,0) width 69: "The table's"
</span><span class="cx"> text run at (2,18) width 83: "caption, with"
</span><span class="cx"> text run at (0,36) width 87: "align=\"right\"."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozilla_expected_failurescorecaptions3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/captions3-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/captions3-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/captions3-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,1196) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (20,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,1322) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (20,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (0,2290) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (0,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> text run at (1,1) width 30: "Data"
</span><span class="cx"> RenderTable {TABLE} at (15,2416) size 90x127 [border: (10px solid #008000)]
</span><span class="cx"> RenderBlock {CAPTION} at (0,0) size 70x60 [border: (3px solid #800080)]
</span><del>- RenderText {#text} at (22,3) size 50x54
</del><ins>+ RenderText {#text} at (22,3) size 51x54
</ins><span class="cx"> text run at (22,3) width 26: "The"
</span><span class="cx"> text run at (15,21) width 40: "table's"
</span><span class="cx"> text run at (10,39) width 50: "caption."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozilla_expected_failuresothertest4expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> text run at (0,18) width 4: " "
</span><span class="cx"> RenderTable {TABLE} at (0,602) size 252x175 [border: (1px none #808080)]
</span><span class="cx"> RenderBlock {CAPTION} at (0,120) size 252x54
</span><del>- RenderText {#text} at (11,0) size 240x54
</del><ins>+ RenderText {#text} at (11,0) size 239x54
</ins><span class="cx"> text run at (11,0) width 230: "Table 4 has this bottom caption. The"
</span><span class="cx"> text run at (6,18) width 240: "table has specified column widths and"
</span><span class="cx"> text run at (66,36) width 120: "collapsing borders."
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-22 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel Layout: SimpleLineLayout needs more position rounding to match InlineFlowBox layout.
+ https://bugs.webkit.org/show_bug.cgi?id=127404
+
+ Reviewed by Antti Koivisto.
+
+ In order to produce a CSS pixel perfect layout, SimpleLineLayout needs to
+ round line positions to CSS (integral) position similarly to InlineFlowBox.
+
+ Existing tests cover it.
+
+ * rendering/SimpleLineLayoutResolver.h:
+ (WebCore::SimpleLineLayout::RunResolver::Run::rect):
+ (WebCore::SimpleLineLayout::RunResolver::Run::baseline):
+
</ins><span class="cx"> 2014-01-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed rollout of r162534, this caused inspector test failures.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (162552 => 162553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2014-01-22 21:58:42 UTC (rev 162552)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2014-01-22 22:03:29 UTC (rev 162553)
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> auto& run = m_iterator.simpleRun();
</span><span class="cx">
</span><span class="cx"> float baselinePosition = resolver.m_lineHeight * m_iterator.lineIndex() + resolver.m_baseline;
</span><del>- LayoutPoint linePosition(floor(run.left), baselinePosition - resolver.m_ascent + resolver.m_borderAndPaddingBefore);
- LayoutSize lineSize(ceil(run.right) - floor(run.left), resolver.m_ascent + resolver.m_descent);
</del><ins>+ LayoutPoint linePosition(LayoutUnit::fromFloatFloor(run.left), roundToInt(baselinePosition - resolver.m_ascent + resolver.m_borderAndPaddingBefore));
+ LayoutSize lineSize(LayoutUnit::fromFloatCeil(run.right) - LayoutUnit::fromFloatFloor(run.left), resolver.m_ascent + resolver.m_descent);
</ins><span class="cx"> return LayoutRect(linePosition, lineSize);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> auto& run = m_iterator.simpleRun();
</span><span class="cx">
</span><span class="cx"> float baselinePosition = resolver.m_lineHeight * m_iterator.lineIndex() + resolver.m_baseline;
</span><del>- return FloatPoint(run.left, baselinePosition + resolver.m_borderAndPaddingBefore);
</del><ins>+ return FloatPoint(run.left, roundToInt(baselinePosition + resolver.m_borderAndPaddingBefore));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline String RunResolver::Run::text() const
</span></span></pre>
</div>
</div>
</body>
</html>