<!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>[174233] 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/174233">174233</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-10-02 15:25:50 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Subpixel] Use floats instead of ints for text justification expansion
https://bugs.webkit.org/show_bug.cgi?id=137327
Reviewed by Zalan Bujtas.
Source/WebCore:
Use a float instead of an int for the expansion variable in InlineBox. The int was inside an inner class
that held a collection of bitfields, and this patch removes that inner-inner variable.
No new tests because there is plenty of existing coverage and existing tests are rebaselined.
* rendering/InlineBox.cpp: Update static_assert for the size of InlineBox.
* rendering/InlineBox.h: Use a float for the justification expansion amount instead of an int bitfield.
(WebCore::InlineBox::InlineBoxBitfields::InlineBoxBitfields): Remove int bitfield.
(WebCore::InlineBox::InlineBox): Initialize float expansion.
(WebCore::InlineBox::expansion): Return a float.
(WebCore::InlineBox::setExpansion): Take a float.
(WebCore::InlineBox::InlineBoxBitfields::expansion): Deleted. Moved to InlineBox.
(WebCore::InlineBox::InlineBoxBitfields::setExpansion): Deleted. Ditto.
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::setExpansion): Take a float.
LayoutTests:
Rebaselining tests due to subpixel differences.
* platform/mac/css1/box_properties/clear_float-expected.txt:
* platform/mac/css1/box_properties/float_on_text_elements-expected.txt:
* platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
* platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt:
* platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt:
* platform/mac/fast/multicol/float-avoidance-expected.txt:
* platform/mac/fast/multicol/overflow-across-columns-expected.txt:
* platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.txt:
* platform/mac/fast/multicol/overflow-unsplittable-expected.txt:
* platform/mac/fast/multicol/positive-leading-expected.txt:
* platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt:
* platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt:
* platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt:
* platform/mac/fast/regions/repaint/line-flow-with-floats-in-regions-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt:
* platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt:
* platform/mac/fast/ruby/bopomofo-rl-expected.txt:
* platform/mac/fast/text/hyphenate-character-expected.txt:
* platform/mac/fast/text/hyphens-expected.txt:
* platform/mac/fast/text/justified-selection-at-edge-expected.txt:
* platform/mac/fast/text/justify-ideograph-leading-expansion-expected.txt:
* platform/mac/fast/text/justify-nbsp-expected.txt: Added.
* platform/mac/fast/text/trailing-white-space-2-expected.txt:
* platform/mac/fast/text/trailing-white-space-expected.txt:
* platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt:
* platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt:
* platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt:
* platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt:
* platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt:
* platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss1box_propertiesclear_floatexpectedtxt">trunk/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss1box_propertiesfloat_on_text_elementsexpectedtxt">trunk/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss21t0905c5525fltcont00dgexpectedtxt">trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss21t0905c5525fltwidth00cgexpectedtxt">trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss21t1602c546txtalign00bexpectedtxt">trunk/LayoutTests/platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolfloatavoidanceexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnsexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnspercentheightexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticoloverflowunsplittableexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/overflow-unsplittable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolpositiveleadingexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/positive-leading-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrfloatavoidanceexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlfloatavoidanceexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastregionsmultipledirectionalitychangesinvariablewidthregionsexpectedtxt">trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastregionsrepaintlineflowwithfloatsinregionsexpectedtxt">trunk/LayoutTests/platform/mac/fast/regions/repaint/line-flow-with-floats-in-regions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats1expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats10expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats2expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats3expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats4expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats5expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats6expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats7expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats8expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats9expectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubybopomoforlexpectedtxt">trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexthyphenatecharacterexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/hyphenate-character-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexthyphensexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/hyphens-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextjustifiedselectionatedgeexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/justified-selection-at-edge-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextjustifyideographleadingexpansionexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/justify-ideograph-leading-expansion-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexttrailingwhitespace2expectedtxt">trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexttrailingwhitespaceexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_tbody_align_justifyexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_td_align_justifyexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_tfoot_align_justifyexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_th_align_justifyexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_thead_align_justifyexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillamarvinx_tr_align_justifyexpectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxcpp">trunk/Source/WebCore/rendering/InlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxh">trunk/Source/WebCore/rendering/InlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfasttextjustifynbspexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/justify-nbsp-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/ChangeLog 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-10-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Subpixel] Use floats instead of ints for text justification expansion
+ https://bugs.webkit.org/show_bug.cgi?id=137327
+
+ Reviewed by Zalan Bujtas.
+
+ Rebaselining tests due to subpixel differences.
+
+ * platform/mac/css1/box_properties/clear_float-expected.txt:
+ * platform/mac/css1/box_properties/float_on_text_elements-expected.txt:
+ * platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
+ * platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt:
+ * platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt:
+ * platform/mac/fast/multicol/float-avoidance-expected.txt:
+ * platform/mac/fast/multicol/overflow-across-columns-expected.txt:
+ * platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.txt:
+ * platform/mac/fast/multicol/overflow-unsplittable-expected.txt:
+ * platform/mac/fast/multicol/positive-leading-expected.txt:
+ * platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt:
+ * platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt:
+ * platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt:
+ * platform/mac/fast/regions/repaint/line-flow-with-floats-in-regions-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt:
+ * platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt:
+ * platform/mac/fast/ruby/bopomofo-rl-expected.txt:
+ * platform/mac/fast/text/hyphenate-character-expected.txt:
+ * platform/mac/fast/text/hyphens-expected.txt:
+ * platform/mac/fast/text/justified-selection-at-edge-expected.txt:
+ * platform/mac/fast/text/justify-ideograph-leading-expansion-expected.txt:
+ * platform/mac/fast/text/justify-nbsp-expected.txt: Added.
+ * platform/mac/fast/text/trailing-white-space-2-expected.txt:
+ * platform/mac/fast/text/trailing-white-space-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt:
+
</ins><span class="cx"> 2014-10-02 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking test as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss1box_propertiesclear_floatexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> RenderBlock {P} at (8,87) size 497x91
</span><span class="cx"> RenderText {#text} at (0,0) size 497x90
</span><span class="cx"> text run at (0,0) width 497: "This page has two floating \"menus\" on the side; one has a green background,"
</span><del>- text run at (0,18) width 231: "and the other a blue background. "
</del><ins>+ text run at (0,18) width 232: "and the other a blue background. "
</ins><span class="cx"> text run at (231,18) width 266: "Due to settings on the 'float' and 'clear'"
</span><span class="cx"> text run at (0,36) width 497: "properties, the two menus should appear on the left side of the page, the blue"
</span><span class="cx"> text run at (0,54) width 497: "below the green. There should be a 10px gap between the two menus. There"
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 283x180
</span><span class="cx"> text run at (0,0) width 283: "This page has two floating \"menus\" on the"
</span><span class="cx"> text run at (0,18) width 283: "side; one has a green background, and the"
</span><del>- text run at (0,36) width 165: "other a blue background. "
</del><ins>+ text run at (0,36) width 166: "other a blue background. "
</ins><span class="cx"> text run at (165,36) width 118: "Due to settings on"
</span><span class="cx"> text run at (0,54) width 283: "the 'float' and 'clear' properties, the two"
</span><span class="cx"> text run at (0,72) width 283: "menus should appear on the left side of the"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss1box_propertiesfloat_on_text_elementsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 785x2714
</span><span class="cx"> RenderBody {BODY} at (8,8) size 769x2698 [bgcolor=#CCCCCC]
</span><span class="cx"> RenderBlock (floating) {P} at (0,0) size 385x36 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,0) size 384x36
- text run at (0,0) width 384: "This paragraph is of class \"one\". It has a width of 50% and"
</del><ins>+ RenderText {#text} at (0,0) size 385x36
+ text run at (0,0) width 385: "This paragraph is of class \"one\". It has a width of 50% and"
</ins><span class="cx"> text run at (0,18) width 124: "is floated to the left."
</span><span class="cx"> RenderBlock {P} at (0,0) size 769x90
</span><span class="cx"> RenderText {#text} at (384,0) size 769x90
</span><span class="lines">@@ -30,12 +30,12 @@
</span><span class="cx"> RenderBR {BR} at (19,87) size 0x0
</span><span class="cx"> RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock (floating) {P} at (0,235) size 385x108 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,0) size 384x108
- text run at (0,0) width 384: "This paragraph is floated to the left and the orange square"
- text run at (0,18) width 384: "image should appear to the right of the paragraph. This"
- text run at (0,36) width 384: "paragraph has a yellow background and no padding, margin"
- text run at (0,54) width 384: "or border. The right edge of this yellow box should be"
- text run at (0,72) width 384: "horizontally aligned with the left edge of the yellow box"
</del><ins>+ RenderText {#text} at (0,0) size 385x108
+ text run at (0,0) width 385: "This paragraph is floated to the left and the orange square"
+ text run at (0,18) width 385: "image should appear to the right of the paragraph. This"
+ text run at (0,36) width 385: "paragraph has a yellow background and no padding, margin"
+ text run at (0,54) width 385: "or border. The right edge of this yellow box should be"
+ text run at (0,72) width 385: "horizontally aligned with the left edge of the yellow box"
</ins><span class="cx"> text run at (0,90) width 79: "undernearth."
</span><span class="cx"> RenderBlock (anonymous) at (0,235) size 769x108
</span><span class="cx"> RenderImage {IMG} at (384,0) size 16x15
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> RenderBR {BR} at (403,15) size 1x0
</span><span class="cx"> RenderBlock {HR} at (0,351) size 769x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock (floating) {P} at (384,361) size 385x108 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,0) size 384x108
- text run at (0,0) width 384: "This paragraph is floated to the right (using a STYLE"
- text run at (0,18) width 384: "attribute) and the orange square image should appear to the"
- text run at (0,36) width 384: "left of the paragraph. This paragraph has a yellow"
- text run at (0,54) width 384: "background and no padding, margin or border. The left edge"
- text run at (0,72) width 384: "of this yellow box should be horizonally aligned with the"
</del><ins>+ RenderText {#text} at (0,0) size 385x108
+ text run at (0,0) width 385: "This paragraph is floated to the right (using a STYLE"
+ text run at (0,18) width 385: "attribute) and the orange square image should appear to the"
+ text run at (0,36) width 385: "left of the paragraph. This paragraph has a yellow"
+ text run at (0,54) width 385: "background and no padding, margin or border. The left edge"
+ text run at (0,72) width 385: "of this yellow box should be horizonally aligned with the"
</ins><span class="cx"> text run at (0,90) width 224: "right edge of the yellow box above."
</span><span class="cx"> RenderBlock (anonymous) at (0,361) size 769x108
</span><span class="cx"> RenderImage {IMG} at (0,0) size 15x15
</span><span class="lines">@@ -87,13 +87,13 @@
</span><span class="cx"> text run at (0,18) width 413: "content of the paragraph should appear on the left side of the"
</span><span class="cx"> text run at (0,36) width 193: "yellow \"sidebar\" on the right. "
</span><span class="cx"> text run at (193,36) width 220: "The content of this element should"
</span><del>- text run at (0,54) width 219: "flow around the floated element. "
</del><ins>+ text run at (0,54) width 220: "flow around the floated element. "
</ins><span class="cx"> text run at (219,54) width 194: "However, the floated element"
</span><span class="cx"> text run at (0,72) width 413: "may or may not be obscured by the blue background of this"
</span><span class="cx"> text run at (0,90) width 413: "element, as the specification does not say which is drawn \"on"
</span><del>- text run at (0,108) width 37: "top.\" "
</del><ins>+ text run at (0,108) width 38: "top.\" "
</ins><span class="cx"> text run at (37,108) width 376: "Even if the floated element is obscured, it still forces the"
</span><del>- text run at (0,126) width 263: "content of this element to flow around it. "
</del><ins>+ text run at (0,126) width 264: "content of this element to flow around it. "
</ins><span class="cx"> text run at (263,126) width 150: "If the floated element is"
</span><span class="cx"> text run at (0,144) width 413: "not obscured, then the blue rectangle of this paragraph should"
</span><span class="cx"> text run at (0,162) width 413: "extend 10px above and to the right of the sidebar's red border,"
</span><span class="lines">@@ -125,17 +125,17 @@
</span><span class="cx"> RenderBlock {HR} at (0,1069) size 769x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock (floating) {DIV} at (0,1079) size 193x72 [bgcolor=#66CCFF]
</span><span class="cx"> RenderBlock {P} at (0,0) size 193x72
</span><del>- RenderText {#text} at (0,0) size 192x72
- text run at (0,0) width 192: "This paragraph is inside a"
- text run at (0,18) width 192: "DIV which is floated left. Its"
- text run at (0,36) width 192: "background is blue and the"
</del><ins>+ RenderText {#text} at (0,0) size 193x72
+ text run at (0,0) width 193: "This paragraph is inside a"
+ text run at (0,18) width 193: "DIV which is floated left. Its"
+ text run at (0,36) width 193: "background is blue and the"
</ins><span class="cx"> text run at (0,54) width 87: "width is 25%."
</span><span class="cx"> RenderBlock (floating) {DIV} at (576,1079) size 193x72 [bgcolor=#FFFF00]
</span><span class="cx"> RenderBlock {P} at (0,0) size 193x72
</span><del>- RenderText {#text} at (0,0) size 192x72
- text run at (0,0) width 192: "This paragraph is inside a"
- text run at (0,18) width 192: "DIV which is floated right. Its"
- text run at (0,36) width 192: "background is yellow and the"
</del><ins>+ RenderText {#text} at (0,0) size 193x72
+ text run at (0,0) width 193: "This paragraph is inside a"
+ text run at (0,18) width 193: "DIV which is floated right. Its"
+ text run at (0,36) width 193: "background is yellow and the"
</ins><span class="cx"> text run at (0,54) width 87: "width is 25%."
</span><span class="cx"> RenderBlock {P} at (0,1079) size 769x36
</span><span class="cx"> RenderText {#text} at (192,0) size 385x36
</span><span class="lines">@@ -148,22 +148,22 @@
</span><span class="cx"> RenderBlock (floating) {DIV} at (0,1169) size 577x126 [bgcolor=#66CCFF]
</span><span class="cx"> RenderBlock (floating) {DIV} at (422,0) size 145x36 [bgcolor=#FFFF00]
</span><span class="cx"> RenderBlock {P} at (0,0) size 145x36
</span><del>- RenderText {#text} at (0,0) size 144x36
- text run at (0,0) width 144: "See description in the"
</del><ins>+ RenderText {#text} at (0,0) size 145x36
+ text run at (0,0) width 145: "See description in the"
</ins><span class="cx"> text run at (0,18) width 124: "box on the left side."
</span><span class="cx"> RenderBlock {P} at (0,0) size 577x126
</span><del>- RenderText {#text} at (0,0) size 576x126
- text run at (0,0) width 422: "This paragraph is inside a DIV which is floated left. The"
- text run at (0,18) width 422: "background of the DIV element is blue and its width is 75%. This"
- text run at (0,36) width 365: "text should all be inside the blue rectangle. The blue DIV "
- text run at (365,36) width 211: "element has another DIV element"
- text run at (0,54) width 166: "as a child. It has a yellow "
- text run at (166,54) width 362: "background color and is floated to the right. Since it is a "
- text run at (528,54) width 48: "child of"
- text run at (0,72) width 374: "the blue DIV, the yellow DIV should appear inside the "
- text run at (374,72) width 202: "blue rectangle. Due to it being"
- text run at (0,90) width 193: "floated to the right and having "
- text run at (193,90) width 383: "a 10px right margin, the yellow rectange should have a 10px"
</del><ins>+ RenderText {#text} at (0,0) size 577x126
+ text run at (0,0) width 423: "This paragraph is inside a DIV which is floated left. The"
+ text run at (0,18) width 423: "background of the DIV element is blue and its width is 75%. This"
+ text run at (0,36) width 366: "text should all be inside the blue rectangle. The blue DIV "
+ text run at (365,36) width 212: "element has another DIV element"
+ text run at (0,54) width 167: "as a child. It has a yellow "
+ text run at (166,54) width 363: "background color and is floated to the right. Since it is a "
+ text run at (528,54) width 49: "child of"
+ text run at (0,72) width 375: "the blue DIV, the yellow DIV should appear inside the "
+ text run at (374,72) width 203: "blue rectangle. Due to it being"
+ text run at (0,90) width 194: "floated to the right and having "
+ text run at (193,90) width 384: "a 10px right margin, the yellow rectange should have a 10px"
</ins><span class="cx"> text run at (0,108) width 31: "blue "
</span><span class="cx"> text run at (31,108) width 138: "stripe on its right side."
</span><span class="cx"> RenderBlock (anonymous) at (0,1169) size 769x126
</span><span class="lines">@@ -182,8 +182,8 @@
</span><span class="cx"> text run at (4,4) width 4: " "
</span><span class="cx"> RenderTableCell {TD} at (12,26) size 755x1357 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span><span class="cx"> RenderBlock (floating) {P} at (4,4) size 374x36 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,0) size 373x36
- text run at (0,0) width 373: "This paragraph is of class \"one\". It has a width of 50% and"
</del><ins>+ RenderText {#text} at (0,0) size 374x36
+ text run at (0,0) width 374: "This paragraph is of class \"one\". It has a width of 50% and"
</ins><span class="cx"> text run at (0,18) width 124: "is floated to the left."
</span><span class="cx"> RenderBlock {P} at (4,4) size 747x90
</span><span class="cx"> RenderText {#text} at (373,0) size 747x90
</span><span class="lines">@@ -208,12 +208,12 @@
</span><span class="cx"> RenderBR {BR} at (19,87) size 0x0
</span><span class="cx"> RenderBlock {HR} at (4,229) size 747x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock (floating) {P} at (4,239) size 374x108 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,0) size 373x108
- text run at (0,0) width 373: "This paragraph is floated to the left and the orange square"
- text run at (0,18) width 373: "image should appear to the right of the paragraph. This"
- text run at (0,36) width 373: "paragraph has a yellow background and no padding,"
- text run at (0,54) width 373: "margin or border. The right edge of this yellow box should"
- text run at (0,72) width 373: "be horizontally aligned with the left edge of the yellow box"
</del><ins>+ RenderText {#text} at (0,0) size 374x108
+ text run at (0,0) width 374: "This paragraph is floated to the left and the orange square"
+ text run at (0,18) width 374: "image should appear to the right of the paragraph. This"
+ text run at (0,36) width 374: "paragraph has a yellow background and no padding,"
+ text run at (0,54) width 374: "margin or border. The right edge of this yellow box should"
+ text run at (0,72) width 374: "be horizontally aligned with the left edge of the yellow box"
</ins><span class="cx"> text run at (0,90) width 79: "undernearth."
</span><span class="cx"> RenderBlock (anonymous) at (4,239) size 747x108
</span><span class="cx"> RenderImage {IMG} at (373,0) size 16x15
</span><span class="lines">@@ -222,12 +222,12 @@
</span><span class="cx"> RenderBR {BR} at (392,15) size 1x0
</span><span class="cx"> RenderBlock {HR} at (4,355) size 747x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock (floating) {P} at (377,365) size 374x108 [bgcolor=#FFFF00]
</span><del>- RenderText {#text} at (0,0) size 373x108
- text run at (0,0) width 373: "This paragraph is floated to the right (using a STYLE"
- text run at (0,18) width 373: "attribute) and the orange square image should appear to the"
- text run at (0,36) width 373: "left of the paragraph. This paragraph has a yellow"
- text run at (0,54) width 373: "background and no padding, margin or border. The left"
- text run at (0,72) width 373: "edge of this yellow box should be horizonally aligned with"
</del><ins>+ RenderText {#text} at (0,0) size 374x108
+ text run at (0,0) width 374: "This paragraph is floated to the right (using a STYLE"
+ text run at (0,18) width 374: "attribute) and the orange square image should appear to the"
+ text run at (0,36) width 374: "left of the paragraph. This paragraph has a yellow"
+ text run at (0,54) width 374: "background and no padding, margin or border. The left"
+ text run at (0,72) width 374: "edge of this yellow box should be horizonally aligned with"
</ins><span class="cx"> text run at (0,90) width 247: "the right edge of the yellow box above."
</span><span class="cx"> RenderBlock (anonymous) at (4,365) size 747x108
</span><span class="cx"> RenderImage {IMG} at (0,0) size 15x15
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> text run at (0,0) width 21: "T"
</span><span class="cx"> RenderText {#text} at (48,0) size 747x72
</span><span class="cx"> text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as"
</span><del>- text run at (48,18) width 513: "well as bold, with a content width of 1.5em and a background-color of silver. "
</del><ins>+ text run at (48,18) width 514: "well as bold, with a content width of 1.5em and a background-color of silver. "
</ins><span class="cx"> text run at (561,18) width 186: "The top of the big letter \"T\""
</span><span class="cx"> text run at (48,36) width 699: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-"
</span><span class="cx"> text run at (0,54) width 33: "cap\"."
</span><span class="lines">@@ -264,16 +264,16 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 391x216
</span><span class="cx"> text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the"
</span><span class="cx"> text run at (0,18) width 391: "textual content of the paragraph should appear on the left side"
</span><del>- text run at (0,36) width 260: "of the yellow \"sidebar\" on the right. "
</del><ins>+ text run at (0,36) width 261: "of the yellow \"sidebar\" on the right. "
</ins><span class="cx"> text run at (260,36) width 131: "The content of this"
</span><span class="cx"> text run at (0,54) width 328: "element should flow around the floated element. "
</span><span class="cx"> text run at (328,54) width 63: "However,"
</span><span class="cx"> text run at (0,72) width 391: "the floated element may or may not be obscured by the blue"
</span><span class="cx"> text run at (0,90) width 391: "background of this element, as the specification does not say"
</span><del>- text run at (0,108) width 185: "which is drawn \"on top.\" "
</del><ins>+ text run at (0,108) width 186: "which is drawn \"on top.\" "
</ins><span class="cx"> text run at (185,108) width 206: "Even if the floated element is"
</span><span class="cx"> text run at (0,126) width 391: "obscured, it still forces the content of this element to flow"
</span><del>- text run at (0,144) width 65: "around it. "
</del><ins>+ text run at (0,144) width 66: "around it. "
</ins><span class="cx"> text run at (65,144) width 326: "If the floated element is not obscured, then the blue"
</span><span class="cx"> text run at (0,162) width 391: "rectangle of this paragraph should extend 10px above and to"
</span><span class="cx"> text run at (0,180) width 391: "the right of the sidebar's red border, due to the margin styles"
</span><span class="lines">@@ -305,22 +305,22 @@
</span><span class="cx"> RenderBlock {HR} at (4,1109) size 747x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock (floating) {DIV} at (4,1119) size 187x72 [bgcolor=#66CCFF]
</span><span class="cx"> RenderBlock {P} at (0,0) size 187x72
</span><del>- RenderText {#text} at (0,0) size 186x72
- text run at (0,0) width 186: "This paragraph is inside a"
- text run at (0,18) width 186: "DIV which is floated left. Its"
- text run at (0,36) width 186: "background is blue and the"
</del><ins>+ RenderText {#text} at (0,0) size 187x72
+ text run at (0,0) width 187: "This paragraph is inside a"
+ text run at (0,18) width 187: "DIV which is floated left. Its"
+ text run at (0,36) width 187: "background is blue and the"
</ins><span class="cx"> text run at (0,54) width 87: "width is 25%."
</span><span class="cx"> RenderBlock (floating) {DIV} at (564,1119) size 187x72 [bgcolor=#FFFF00]
</span><span class="cx"> RenderBlock {P} at (0,0) size 187x72
</span><del>- RenderText {#text} at (0,0) size 186x72
- text run at (0,0) width 186: "This paragraph is inside a"
- text run at (0,18) width 186: "DIV which is floated right."
- text run at (0,36) width 20: "Its "
- text run at (20,36) width 166: "background is yellow and"
</del><ins>+ RenderText {#text} at (0,0) size 187x72
+ text run at (0,0) width 187: "This paragraph is inside a"
+ text run at (0,18) width 187: "DIV which is floated right."
+ text run at (0,36) width 21: "Its "
+ text run at (20,36) width 167: "background is yellow and"
</ins><span class="cx"> text run at (0,54) width 110: "the width is 25%."
</span><span class="cx"> RenderBlock {P} at (4,1119) size 747x36
</span><del>- RenderText {#text} at (186,0) size 374x36
- text run at (186,0) width 374: "This paragraph should appear between a blue box (on the"
</del><ins>+ RenderText {#text} at (186,0) size 375x36
+ text run at (186,0) width 375: "This paragraph should appear between a blue box (on the"
</ins><span class="cx"> text run at (186,18) width 30: "left) "
</span><span class="cx"> text run at (215,18) width 200: "and a yellow box (on the right)."
</span><span class="cx"> RenderBlock (anonymous) at (4,1155) size 747x36
</span><span class="lines">@@ -329,23 +329,23 @@
</span><span class="cx"> RenderBlock (floating) {DIV} at (4,1209) size 561x126 [bgcolor=#66CCFF]
</span><span class="cx"> RenderBlock (floating) {DIV} at (410,0) size 141x36 [bgcolor=#FFFF00]
</span><span class="cx"> RenderBlock {P} at (0,0) size 141x36
</span><del>- RenderText {#text} at (0,0) size 140x36
- text run at (0,0) width 140: "See description in the"
</del><ins>+ RenderText {#text} at (0,0) size 141x36
+ text run at (0,0) width 141: "See description in the"
</ins><span class="cx"> text run at (0,18) width 124: "box on the left side."
</span><span class="cx"> RenderBlock {P} at (0,0) size 561x126
</span><del>- RenderText {#text} at (0,0) size 560x126
- text run at (0,0) width 410: "This paragraph is inside a DIV which is floated left. The"
- text run at (0,18) width 410: "background of the DIV element is blue and its width is 75%."
- text run at (0,36) width 32: "This "
- text run at (32,36) width 368: "text should all be inside the blue rectangle. The blue DIV "
- text run at (400,36) width 160: "element has another DIV"
- text run at (0,54) width 217: "element as a child. It has a yellow "
- text run at (217,54) width 343: "background color and is floated to the right. Since it is"
- text run at (0,72) width 11: "a "
- text run at (11,72) width 408: "child of the blue DIV, the yellow DIV should appear inside the "
- text run at (419,72) width 141: "blue rectangle. Due to"
- text run at (0,90) width 252: "it being floated to the right and having "
- text run at (252,90) width 308: "a 10px right margin, the yellow rectange should"
</del><ins>+ RenderText {#text} at (0,0) size 561x126
+ text run at (0,0) width 411: "This paragraph is inside a DIV which is floated left. The"
+ text run at (0,18) width 411: "background of the DIV element is blue and its width is 75%."
+ text run at (0,36) width 33: "This "
+ text run at (32,36) width 369: "text should all be inside the blue rectangle. The blue DIV "
+ text run at (400,36) width 161: "element has another DIV"
+ text run at (0,54) width 218: "element as a child. It has a yellow "
+ text run at (217,54) width 344: "background color and is floated to the right. Since it is"
+ text run at (0,72) width 12: "a "
+ text run at (11,72) width 409: "child of the blue DIV, the yellow DIV should appear inside the "
+ text run at (419,72) width 142: "blue rectangle. Due to"
+ text run at (0,90) width 253: "it being floated to the right and having "
+ text run at (252,90) width 309: "a 10px right margin, the yellow rectange should"
</ins><span class="cx"> text run at (0,108) width 112: "have a 10px blue "
</span><span class="cx"> text run at (112,108) width 138: "stripe on its right side."
</span><span class="cx"> RenderBlock (anonymous) at (4,1209) size 747x126
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss21t0905c5525fltcont00dgexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -10,37 +10,37 @@
</span><span class="cx"> text run at (0,0) width 294: "To the right of this teal box there should be a"
</span><span class="cx"> text run at (0,18) width 94: "purple square, "
</span><span class="cx"> text run at (94,18) width 200: "tightly squeezed in between the"
</span><del>- text run at (0,36) width 193: "edge of the teal box and the "
</del><ins>+ text run at (0,36) width 194: "edge of the teal box and the "
</ins><span class="cx"> text run at (193,36) width 101: "outside edge of"
</span><span class="cx"> text run at (0,57) width 113: "the blue block. \x{21E8}"
</span><span class="cx"> RenderBlock {P} at (0,0) size 588x258
</span><span class="cx"> RenderText {#text} at (0,0) size 277x39
</span><span class="cx"> text run at (0,0) width 277: "Inside this blue block on the right there"
</span><del>- text run at (0,21) width 159: "should be a teal box. \x{21E8} "
</del><ins>+ text run at (0,21) width 160: "should be a teal box. \x{21E8} "
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 588x237 [color=#000080]
</span><span class="cx"> RenderText {#text} at (159,21) size 588x237
</span><span class="cx"> text run at (159,21) width 118: "FAIL FAIL FAIL"
</span><span class="cx"> text run at (0,42) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,60) width 80: "FAIL FAIL "
</del><ins>+ text run at (0,60) width 81: "FAIL FAIL "
</ins><span class="cx"> text run at (80,60) width 197: "FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,78) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</del><ins>+ text run at (0,78) width 298: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</ins><span class="cx"> text run at (297,78) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,96) width 212: "FAIL FAIL FAIL FAIL FAIL "
</del><ins>+ text run at (0,96) width 213: "FAIL FAIL FAIL FAIL FAIL "
</ins><span class="cx"> text run at (212,96) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,114) width 127: "FAIL FAIL FAIL "
</del><ins>+ text run at (0,114) width 128: "FAIL FAIL FAIL "
</ins><span class="cx"> text run at (127,114) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,132) width 42: "FAIL "
</del><ins>+ text run at (0,132) width 43: "FAIL "
</ins><span class="cx"> text run at (42,132) width 510: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</span><span class="cx"> text run at (552,132) width 36: "FAIL"
</span><del>- text run at (0,150) width 467: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</del><ins>+ text run at (0,150) width 468: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</ins><span class="cx"> text run at (467,150) width 121: "FAIL FAIL FAIL"
</span><del>- text run at (0,168) width 382: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</del><ins>+ text run at (0,168) width 383: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</ins><span class="cx"> text run at (382,168) width 206: "FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,186) width 297: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</del><ins>+ text run at (0,186) width 298: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
</ins><span class="cx"> text run at (297,186) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,204) width 212: "FAIL FAIL FAIL FAIL FAIL "
</del><ins>+ text run at (0,204) width 213: "FAIL FAIL FAIL FAIL FAIL "
</ins><span class="cx"> text run at (212,204) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><del>- text run at (0,222) width 127: "FAIL FAIL FAIL "
</del><ins>+ text run at (0,222) width 128: "FAIL FAIL FAIL "
</ins><span class="cx"> text run at (127,222) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span><span class="cx"> text run at (0,240) width 40: "FAIL "
</span><span class="cx"> text run at (40,240) width 476: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss21t0905c5525fltwidth00cgexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -10,91 +10,91 @@
</span><span class="cx"> text run at (81,48) width 560: "of the viewport, on the left of the 50% ruler"
</span><span class="cx"> text run at (0,85) width 74: "mark."
</span><span class="cx"> RenderBlock (floating) {DIV} at (0,154) size 385x342 [color=#FFFFFF] [bgcolor=#0000FF]
</span><del>- RenderText {#text} at (0,0) size 384x342
- text run at (0,0) width 384: "ignore this float text ignore this float text ignore this"
- text run at (0,18) width 42: "float "
- text run at (42,18) width 342: "text ignore this float text ignore this float text"
- text run at (0,36) width 78: "ignore this "
- text run at (78,36) width 306: "float text ignore this float text ignore this"
- text run at (0,54) width 125: "float text ignore "
- text run at (125,54) width 259: "this float text ignore this float text"
- text run at (0,72) width 155: "ignore this float text "
- text run at (155,72) width 229: "ignore this float text ignore this"
- text run at (0,90) width 198: "float text ignore this float "
- text run at (198,90) width 186: "text ignore this float text"
- text run at (0,108) width 234: "ignore this float text ignore this "
- text run at (234,108) width 150: "float text ignore this"
- text run at (0,126) width 282: "float text ignore this float text ignore "
- text run at (282,126) width 102: "this float text"
- text run at (0,144) width 311: "ignore this float text ignore this float text "
- text run at (311,144) width 73: "ignore this"
- text run at (0,162) width 355: "float text ignore this float text ignore this float "
- text run at (355,162) width 29: "text"
- text run at (0,180) width 384: "ignore this float text ignore this float text ignore this"
- text run at (0,198) width 384: "float text ignore this float text ignore this float text"
- text run at (0,216) width 47: "ignore "
- text run at (47,216) width 337: "this float text ignore this float text ignore this"
- text run at (0,234) width 77: "float text "
- text run at (77,234) width 307: "ignore this float text ignore this float text"
- text run at (0,252) width 120: "ignore this float "
- text run at (120,252) width 264: "text ignore this float text ignore this"
- text run at (0,270) width 156: "float text ignore this "
- text run at (156,270) width 228: "float text ignore this float text"
- text run at (0,288) width 203: "ignore this float text ignore "
- text run at (203,288) width 181: "this float text ignore this"
</del><ins>+ RenderText {#text} at (0,0) size 385x342
+ text run at (0,0) width 385: "ignore this float text ignore this float text ignore this"
+ text run at (0,18) width 43: "float "
+ text run at (42,18) width 343: "text ignore this float text ignore this float text"
+ text run at (0,36) width 79: "ignore this "
+ text run at (78,36) width 307: "float text ignore this float text ignore this"
+ text run at (0,54) width 126: "float text ignore "
+ text run at (125,54) width 260: "this float text ignore this float text"
+ text run at (0,72) width 156: "ignore this float text "
+ text run at (155,72) width 230: "ignore this float text ignore this"
+ text run at (0,90) width 199: "float text ignore this float "
+ text run at (198,90) width 187: "text ignore this float text"
+ text run at (0,108) width 235: "ignore this float text ignore this "
+ text run at (234,108) width 151: "float text ignore this"
+ text run at (0,126) width 283: "float text ignore this float text ignore "
+ text run at (282,126) width 103: "this float text"
+ text run at (0,144) width 312: "ignore this float text ignore this float text "
+ text run at (311,144) width 74: "ignore this"
+ text run at (0,162) width 356: "float text ignore this float text ignore this float "
+ text run at (355,162) width 30: "text"
+ text run at (0,180) width 385: "ignore this float text ignore this float text ignore this"
+ text run at (0,198) width 385: "float text ignore this float text ignore this float text"
+ text run at (0,216) width 48: "ignore "
+ text run at (47,216) width 338: "this float text ignore this float text ignore this"
+ text run at (0,234) width 78: "float text "
+ text run at (77,234) width 308: "ignore this float text ignore this float text"
+ text run at (0,252) width 121: "ignore this float "
+ text run at (120,252) width 265: "text ignore this float text ignore this"
+ text run at (0,270) width 157: "float text ignore this "
+ text run at (156,270) width 229: "float text ignore this float text"
+ text run at (0,288) width 204: "ignore this float text ignore "
+ text run at (203,288) width 182: "this float text ignore this"
</ins><span class="cx"> text run at (0,306) width 234: "float text ignore this float text "
</span><del>- text run at (234,306) width 150: "ignore this float text"
</del><ins>+ text run at (234,306) width 151: "ignore this float text"
</ins><span class="cx"> text run at (0,324) width 259: "ignore this float text ignore this float"
</span><span class="cx"> RenderBlock {DIV} at (0,154) size 769x468 [color=#C0C0C0]
</span><span class="cx"> RenderText {#text} at (384,0) size 769x468
</span><span class="cx"> text run at (384,0) width 385: "this is some dummy text this is some dummy text this is"
</span><del>- text run at (384,18) width 97: "some dummy "
- text run at (480,18) width 289: "text this is some dummy text this is some"
</del><ins>+ text run at (384,18) width 98: "some dummy "
+ text run at (481,18) width 288: "text this is some dummy text this is some"
</ins><span class="cx"> text run at (384,36) width 169: "dummy text this is some "
</span><span class="cx"> text run at (552,36) width 217: "dummy text this is some dummy"
</span><span class="cx"> text run at (384,54) width 230: "text this is some dummy text this is "
</span><span class="cx"> text run at (613,54) width 156: "some dummy text this is"
</span><del>- text run at (384,72) width 304: "some dummy text this is some dummy text "
- text run at (687,72) width 82: "this is some"
</del><ins>+ text run at (384,72) width 305: "some dummy text this is some dummy text "
+ text run at (688,72) width 81: "this is some"
</ins><span class="cx"> text run at (384,90) width 385: "dummy text this is some dummy text this is some dummy"
</span><span class="cx"> text run at (384,108) width 385: "text this is some dummy text this is some dummy text this is"
</span><del>- text run at (384,126) width 41: "some "
- text run at (424,126) width 345: "dummy text this is some dummy text this is some"
- text run at (384,144) width 129: "dummy text this is "
- text run at (512,144) width 257: "some dummy text this is some dummy"
- text run at (384,162) width 188: "text this is some dummy text "
- text run at (571,162) width 198: "this is some dummy text this is"
- text run at (384,180) width 273: "some dummy text this is some dummy "
- text run at (656,180) width 113: "text this is some"
</del><ins>+ text run at (384,126) width 42: "some "
+ text run at (425,126) width 344: "dummy text this is some dummy text this is some"
+ text run at (384,144) width 130: "dummy text this is "
+ text run at (513,144) width 256: "some dummy text this is some dummy"
+ text run at (384,162) width 189: "text this is some dummy text "
+ text run at (572,162) width 197: "this is some dummy text this is"
+ text run at (384,180) width 274: "some dummy text this is some dummy "
+ text run at (657,180) width 112: "text this is some"
</ins><span class="cx"> text run at (384,198) width 337: "dummy text this is some dummy text this is some "
</span><del>- text run at (720,198) width 49: "dummy"
</del><ins>+ text run at (721,198) width 48: "dummy"
</ins><span class="cx"> text run at (384,216) width 385: "text this is some dummy text this is some dummy text this is"
</span><span class="cx"> text run at (384,234) width 385: "some dummy text this is some dummy text this is some"
</span><del>- text run at (384,252) width 84: "dummy text "
- text run at (467,252) width 302: "this is some dummy text this is some dummy"
- text run at (384,270) width 160: "text this is some dummy "
- text run at (543,270) width 226: "text this is some dummy text this is"
- text run at (384,288) width 217: "some dummy text this is some "
- text run at (600,288) width 169: "dummy text this is some"
</del><ins>+ text run at (384,252) width 85: "dummy text "
+ text run at (468,252) width 301: "this is some dummy text this is some dummy"
+ text run at (384,270) width 161: "text this is some dummy "
+ text run at (544,270) width 225: "text this is some dummy text this is"
+ text run at (384,288) width 218: "some dummy text this is some "
+ text run at (601,288) width 168: "dummy text this is some"
</ins><span class="cx"> text run at (384,306) width 298: "dummy text this is some dummy text this is "
</span><span class="cx"> text run at (681,306) width 88: "some dummy"
</span><del>- text run at (384,324) width 348: "text this is some dummy text this is some dummy text "
- text run at (731,324) width 38: "this is"
- text run at (0,342) width 404: "some dummy text this is some dummy text this is some dummy "
</del><ins>+ text run at (384,324) width 349: "text this is some dummy text this is some dummy text "
+ text run at (732,324) width 37: "this is"
+ text run at (0,342) width 405: "some dummy text this is some dummy text this is some dummy "
</ins><span class="cx"> text run at (404,342) width 365: "text this is some dummy text this is some dummy text this"
</span><del>- text run at (0,360) width 52: "is some "
- text run at (52,360) width 443: "dummy text this is some dummy text this is some dummy text this is "
</del><ins>+ text run at (0,360) width 53: "is some "
+ text run at (52,360) width 444: "dummy text this is some dummy text this is some dummy text this is "
</ins><span class="cx"> text run at (495,360) width 274: "some dummy text this is some dummy text"
</span><del>- text run at (0,378) width 160: "this is some dummy text "
- text run at (160,378) width 453: "this is some dummy text this is some dummy text this is some dummy "
</del><ins>+ text run at (0,378) width 161: "this is some dummy text "
+ text run at (160,378) width 454: "this is some dummy text this is some dummy text this is some dummy "
</ins><span class="cx"> text run at (613,378) width 156: "text this is some dummy"
</span><del>- text run at (0,396) width 277: "text this is some dummy text this is some "
</del><ins>+ text run at (0,396) width 278: "text this is some dummy text this is some "
</ins><span class="cx"> text run at (277,396) width 459: "dummy text this is some dummy text this is some dummy text this is "
</span><span class="cx"> text run at (736,396) width 33: "some"
</span><del>- text run at (0,414) width 406: "dummy text this is some dummy text this is some dummy text "
</del><ins>+ text run at (0,414) width 407: "dummy text this is some dummy text this is some dummy text "
</ins><span class="cx"> text run at (406,414) width 363: "this is some dummy text this is some dummy text this is"
</span><del>- text run at (0,432) width 89: "some dummy "
- text run at (89,432) width 420: "text this is some dummy text this is some dummy text this is some "
</del><ins>+ text run at (0,432) width 90: "some dummy "
+ text run at (89,432) width 421: "text this is some dummy text this is some dummy text this is some "
</ins><span class="cx"> text run at (509,432) width 260: "dummy text this is some dummy text this"
</span><span class="cx"> text run at (0,450) width 170: "is some dummy text this is "
</span><span class="cx"> text run at (170,450) width 268: "some dummy text this is some dummy text"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss21t1602c546txtalign00bexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/css2.1/t1602-c546-txt-align-00-b-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -13,40 +13,40 @@
</span><span class="cx"> RenderText {#text} at (286,0) size 212x18
</span><span class="cx"> text run at (286,0) width 212: "This sentence should be centered."
</span><span class="cx"> RenderBlock {P} at (0,102) size 784x252 [color=#000080]
</span><del>- RenderText {#text} at (0,0) size 496x18
- text run at (0,0) width 392: "This paragraph should be justified (the right and left margins "
- text run at (392,0) width 104: "should line up). "
</del><ins>+ RenderText {#text} at (0,0) size 498x18
+ text run at (0,0) width 393: "This paragraph should be justified (the right and left margins "
+ text run at (392,0) width 106: "should line up). "
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 784x252 [color=#C0C0C0]
</span><del>- RenderText {#text} at (496,0) size 784x252
- text run at (496,0) width 288: "This is just lovely dummy text. Dummy text."
- text run at (0,18) width 56: "Dummy "
- text run at (56,18) width 529: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</del><ins>+ RenderText {#text} at (497,0) size 784x252
+ text run at (497,0) width 287: "This is just lovely dummy text. Dummy text."
+ text run at (0,18) width 57: "Dummy "
+ text run at (56,18) width 530: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</ins><span class="cx"> text run at (585,18) width 199: "This is just lovely dummy text."
</span><del>- text run at (0,36) width 349: "This is just lovely dummy text. Dummy text. Dummy "
</del><ins>+ text run at (0,36) width 350: "This is just lovely dummy text. Dummy text. Dummy "
</ins><span class="cx"> text run at (349,36) width 435: "text. This is just lovely dummy text. This is just lovely dummy text."
</span><del>- text run at (0,54) width 88: "Dummy text. "
- text run at (88,54) width 550: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
</del><ins>+ text run at (0,54) width 89: "Dummy text. "
+ text run at (88,54) width 551: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
</ins><span class="cx"> text run at (638,54) width 146: "text. This is just lovely"
</span><del>- text run at (0,72) width 379: "dummy text. This is just lovely dummy text. Dummy text. "
</del><ins>+ text run at (0,72) width 380: "dummy text. This is just lovely dummy text. Dummy text. "
</ins><span class="cx"> text run at (379,72) width 405: "This is just lovely dummy text. This is just lovely dummy text."
</span><del>- text run at (0,90) width 145: "Dummy text. Dummy "
- text run at (145,90) width 525: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</del><ins>+ text run at (0,90) width 146: "Dummy text. Dummy "
+ text run at (145,90) width 526: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</ins><span class="cx"> text run at (670,90) width 114: "This is just lovely"
</span><del>- text run at (0,108) width 434: "dummy text. This is just lovely dummy text. Dummy text. Dummy "
</del><ins>+ text run at (0,108) width 435: "dummy text. This is just lovely dummy text. Dummy text. Dummy "
</ins><span class="cx"> text run at (434,108) width 350: "text. This is just lovely dummy text. This is just lovely"
</span><del>- text run at (0,126) width 170: "dummy text. Dummy text. "
- text run at (170,126) width 540: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
</del><ins>+ text run at (0,126) width 171: "dummy text. Dummy text. "
+ text run at (170,126) width 541: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
</ins><span class="cx"> text run at (710,126) width 74: "text. This is"
</span><del>- text run at (0,144) width 458: "just lovely dummy text. This is just lovely dummy text. Dummy text. "
</del><ins>+ text run at (0,144) width 459: "just lovely dummy text. This is just lovely dummy text. Dummy text. "
</ins><span class="cx"> text run at (458,144) width 326: "This is just lovely dummy text. This is just lovely"
</span><del>- text run at (0,162) width 226: "dummy text. Dummy text. Dummy "
- text run at (226,162) width 515: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</del><ins>+ text run at (0,162) width 227: "dummy text. Dummy text. Dummy "
+ text run at (226,162) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</ins><span class="cx"> text run at (741,162) width 43: "This is"
</span><del>- text run at (0,180) width 505: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
</del><ins>+ text run at (0,180) width 506: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy "
</ins><span class="cx"> text run at (505,180) width 279: "text. This is just lovely dummy text. This is"
</span><span class="cx"> text run at (0,198) width 242: "just lovely dummy text. Dummy text. "
</span><span class="cx"> text run at (242,198) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy"
</span><del>- text run at (0,216) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</del><ins>+ text run at (0,216) width 517: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. "
</ins><span class="cx"> text run at (516,216) width 268: "This is just lovely dummy text. This is just"
</span><span class="cx"> text run at (0,234) width 269: "lovely dummy text. Dummy text. Dummy "
</span><span class="cx"> text run at (269,234) width 118: "text. Dummy text. "
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolfloatavoidanceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx"> RenderBlock {P} at (0,16) size 415x90
</span><span class="cx"> RenderText {#text} at (0,0) size 415x90
</span><span class="cx"> text run at (0,0) width 415: "This technology preview of our award winning next generation"
</span><del>- text run at (0,18) width 56: "browser "
</del><ins>+ text run at (0,18) width 57: "browser "
</ins><span class="cx"> text run at (56,18) width 359: "is a sign of things to come from Mozilla. Powerful yet"
</span><del>- text run at (0,36) width 122: "easy to use. This "
</del><ins>+ text run at (0,36) width 123: "easy to use. This "
</ins><span class="cx"> text run at (122,36) width 293: "maintenance release provides a few updates"
</span><del>- text run at (0,54) width 246: "based on user feedback - including "
</del><ins>+ text run at (0,54) width 247: "based on user feedback - including "
</ins><span class="cx"> text run at (246,54) width 169: "changes to the Extension"
</span><span class="cx"> text run at (0,72) width 201: "System and icon improvements."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -10,64 +10,64 @@
</span><span class="cx"> RenderMultiColumnFlowThread at (3,3) size 159x1454
</span><span class="cx"> layer at (11,11) size 159x1454 backgroundClip at (11,11) size 159x589 clip at (11,11) size 159x589 outlineClip at (0,0) size 800x600
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 159x1454
</span><del>- RenderText {#text} at (0,5) size 158x1444
- text run at (0,5) width 158: "Lorem ipsum dolor sit amet,"
- text run at (0,29) width 158: "consectetur adipiscing elit."
- text run at (0,53) width 158: "Nullam ornare, nunc eget"
- text run at (0,77) width 158: "condimentum tempor, augue"
- text run at (0,101) width 158: "ligula accumsan eros, sed"
- text run at (0,125) width 158: "consequat sapien orci id libero."
- text run at (0,149) width 158: "Curabitur tristique, augue in"
- text run at (0,173) width 158: "aliquet accumsan, nibh nisi"
- text run at (0,197) width 158: "lobortis odio, et suscipit est ligula"
- text run at (0,221) width 158: "eu nisi. Nunc aliquet lobortis"
- text run at (0,245) width 158: "porta. Donec venenatis"
- text run at (0,269) width 158: "consectetur eleifend. Etiam sed"
- text run at (0,293) width 158: "tempor quam. Pellentesque"
- text run at (0,317) width 158: "gravida gravida eros venenatis"
- text run at (0,341) width 158: "suscipit. Aenean diam enim,"
- text run at (0,365) width 158: "suscipit id pellentesque vel,"
- text run at (0,389) width 158: "hendrerit et metus. Suspendisse"
- text run at (0,413) width 158: "felis erat, hendrerit a congue in,"
- text run at (0,437) width 158: "euismod ac erat. Donec pulvinar"
- text run at (0,461) width 158: "venenatis tortor, a lobortis erat"
- text run at (0,504) width 158: "scelerisque et. Class aptent taciti"
- text run at (0,528) width 158: "sociosqu ad litora torquent per"
- text run at (0,552) width 158: "conubia nostra, per inceptos"
- text run at (0,576) width 158: "himenaeos. Aliquam in orci id"
- text run at (0,600) width 158: "felis mollis porta ac et orci."
- text run at (0,624) width 158: "Donec viverra, eros ac mattis"
- text run at (0,648) width 158: "dapibus, quam ante porta lectus,"
- text run at (0,672) width 158: "accumsan pellentesque nibh"
- text run at (0,696) width 158: "metus non felis. Vivamus sed"
- text run at (0,720) width 158: "eros quis magna scelerisque"
- text run at (0,744) width 116: "ultrices ac eget velit. "
- text run at (116,744) width 42: "Nunc et"
- text run at (0,768) width 158: "odio ut velit posuere viverra."
- text run at (0,792) width 158: "Integer eu mi quis velit dapibus"
- text run at (0,816) width 158: "tempus at ut purus. Quisque"
- text run at (0,840) width 158: "congue mollis mauris a hendrerit."
- text run at (0,864) width 158: "Nam viverra est at orci interdum"
- text run at (0,888) width 158: "a ullamcorper mi dictum. In id"
- text run at (0,912) width 158: "sapien augue. Suspendisse"
- text run at (0,936) width 158: "potenti. Vestibulum turpis purus,"
- text run at (0,960) width 158: "convallis ut sagittis quis, semper"
- text run at (0,1003) width 158: "vel mauris. Curabitur vitae felis"
- text run at (0,1027) width 158: "turpis. Fusce augue nibh,"
- text run at (0,1051) width 158: "consectetur non vestibulum et,"
- text run at (0,1075) width 158: "bibendum sit amet lectus. Nulla"
- text run at (0,1099) width 158: "at imperdiet metus. Donec non"
- text run at (0,1123) width 158: "est velit, non fringilla ipsum."
- text run at (0,1147) width 158: "Fusce elementum neque a nibh"
- text run at (0,1171) width 158: "egestas sodales. Mauris ut lorem"
- text run at (0,1195) width 158: "hendrerit metus interdum"
- text run at (0,1219) width 158: "malesuada. Nam tempus sodales"
- text run at (0,1243) width 158: "neque vitae bibendum."
- text run at (0,1267) width 158: "Vestibulum ac est sit amet dolor"
- text run at (0,1291) width 158: "vehicula semper at sed ante."
- text run at (0,1315) width 158: "Nunc at neque urna, in volutpat"
- text run at (0,1339) width 158: "orci. Praesent eu velit neque, quis"
- text run at (0,1363) width 158: "rutrum metus. Nunc eu ipsum sit"
- text run at (0,1387) width 158: "amet ligula mattis porttitor sit"
- text run at (0,1411) width 158: "amet id felis. Integer volutpat"
</del><ins>+ RenderText {#text} at (0,5) size 159x1444
+ text run at (0,5) width 159: "Lorem ipsum dolor sit amet,"
+ text run at (0,29) width 159: "consectetur adipiscing elit."
+ text run at (0,53) width 159: "Nullam ornare, nunc eget"
+ text run at (0,77) width 159: "condimentum tempor, augue"
+ text run at (0,101) width 159: "ligula accumsan eros, sed"
+ text run at (0,125) width 159: "consequat sapien orci id libero."
+ text run at (0,149) width 159: "Curabitur tristique, augue in"
+ text run at (0,173) width 159: "aliquet accumsan, nibh nisi"
+ text run at (0,197) width 159: "lobortis odio, et suscipit est ligula"
+ text run at (0,221) width 159: "eu nisi. Nunc aliquet lobortis"
+ text run at (0,245) width 159: "porta. Donec venenatis"
+ text run at (0,269) width 159: "consectetur eleifend. Etiam sed"
+ text run at (0,293) width 159: "tempor quam. Pellentesque"
+ text run at (0,317) width 159: "gravida gravida eros venenatis"
+ text run at (0,341) width 159: "suscipit. Aenean diam enim,"
+ text run at (0,365) width 159: "suscipit id pellentesque vel,"
+ text run at (0,389) width 159: "hendrerit et metus. Suspendisse"
+ text run at (0,413) width 159: "felis erat, hendrerit a congue in,"
+ text run at (0,437) width 159: "euismod ac erat. Donec pulvinar"
+ text run at (0,461) width 159: "venenatis tortor, a lobortis erat"
+ text run at (0,504) width 159: "scelerisque et. Class aptent taciti"
+ text run at (0,528) width 159: "sociosqu ad litora torquent per"
+ text run at (0,552) width 159: "conubia nostra, per inceptos"
+ text run at (0,576) width 159: "himenaeos. Aliquam in orci id"
+ text run at (0,600) width 159: "felis mollis porta ac et orci."
+ text run at (0,624) width 159: "Donec viverra, eros ac mattis"
+ text run at (0,648) width 159: "dapibus, quam ante porta lectus,"
+ text run at (0,672) width 159: "accumsan pellentesque nibh"
+ text run at (0,696) width 159: "metus non felis. Vivamus sed"
+ text run at (0,720) width 159: "eros quis magna scelerisque"
+ text run at (0,744) width 117: "ultrices ac eget velit. "
+ text run at (116,744) width 43: "Nunc et"
+ text run at (0,768) width 159: "odio ut velit posuere viverra."
+ text run at (0,792) width 159: "Integer eu mi quis velit dapibus"
+ text run at (0,816) width 159: "tempus at ut purus. Quisque"
+ text run at (0,840) width 159: "congue mollis mauris a hendrerit."
+ text run at (0,864) width 159: "Nam viverra est at orci interdum"
+ text run at (0,888) width 159: "a ullamcorper mi dictum. In id"
+ text run at (0,912) width 159: "sapien augue. Suspendisse"
+ text run at (0,936) width 159: "potenti. Vestibulum turpis purus,"
+ text run at (0,960) width 159: "convallis ut sagittis quis, semper"
+ text run at (0,1003) width 159: "vel mauris. Curabitur vitae felis"
+ text run at (0,1027) width 159: "turpis. Fusce augue nibh,"
+ text run at (0,1051) width 159: "consectetur non vestibulum et,"
+ text run at (0,1075) width 159: "bibendum sit amet lectus. Nulla"
+ text run at (0,1099) width 159: "at imperdiet metus. Donec non"
+ text run at (0,1123) width 159: "est velit, non fringilla ipsum."
+ text run at (0,1147) width 159: "Fusce elementum neque a nibh"
+ text run at (0,1171) width 159: "egestas sodales. Mauris ut lorem"
+ text run at (0,1195) width 159: "hendrerit metus interdum"
+ text run at (0,1219) width 159: "malesuada. Nam tempus sodales"
+ text run at (0,1243) width 159: "neque vitae bibendum."
+ text run at (0,1267) width 159: "Vestibulum ac est sit amet dolor"
+ text run at (0,1291) width 159: "vehicula semper at sed ante."
+ text run at (0,1315) width 159: "Nunc at neque urna, in volutpat"
+ text run at (0,1339) width 159: "orci. Praesent eu velit neque, quis"
+ text run at (0,1363) width 159: "rutrum metus. Nunc eu ipsum sit"
+ text run at (0,1387) width 159: "amet ligula mattis porttitor sit"
+ text run at (0,1411) width 159: "amet id felis. Integer volutpat"
</ins><span class="cx"> text run at (0,1435) width 110: "aliquam odio et feugiat."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnspercentheightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -11,64 +11,64 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 159x1454
</span><span class="cx"> layer at (11,11) size 159x1454 backgroundClip at (11,11) size 159x589 clip at (11,11) size 159x589 outlineClip at (0,0) size 800x600
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 159x1454
</span><del>- RenderText {#text} at (0,5) size 158x1444
- text run at (0,5) width 158: "Lorem ipsum dolor sit amet,"
- text run at (0,29) width 158: "consectetur adipiscing elit."
- text run at (0,53) width 158: "Nullam ornare, nunc eget"
- text run at (0,77) width 158: "condimentum tempor, augue"
- text run at (0,101) width 158: "ligula accumsan eros, sed"
- text run at (0,125) width 158: "consequat sapien orci id libero."
- text run at (0,149) width 158: "Curabitur tristique, augue in"
- text run at (0,173) width 158: "aliquet accumsan, nibh nisi"
- text run at (0,197) width 158: "lobortis odio, et suscipit est ligula"
- text run at (0,221) width 158: "eu nisi. Nunc aliquet lobortis"
- text run at (0,245) width 158: "porta. Donec venenatis"
- text run at (0,269) width 158: "consectetur eleifend. Etiam sed"
- text run at (0,293) width 158: "tempor quam. Pellentesque"
- text run at (0,317) width 158: "gravida gravida eros venenatis"
- text run at (0,341) width 158: "suscipit. Aenean diam enim,"
- text run at (0,365) width 158: "suscipit id pellentesque vel,"
- text run at (0,389) width 158: "hendrerit et metus. Suspendisse"
- text run at (0,413) width 158: "felis erat, hendrerit a congue in,"
- text run at (0,437) width 158: "euismod ac erat. Donec pulvinar"
- text run at (0,461) width 158: "venenatis tortor, a lobortis erat"
- text run at (0,504) width 158: "scelerisque et. Class aptent taciti"
- text run at (0,528) width 158: "sociosqu ad litora torquent per"
- text run at (0,552) width 158: "conubia nostra, per inceptos"
- text run at (0,576) width 158: "himenaeos. Aliquam in orci id"
- text run at (0,600) width 158: "felis mollis porta ac et orci."
- text run at (0,624) width 158: "Donec viverra, eros ac mattis"
- text run at (0,648) width 158: "dapibus, quam ante porta lectus,"
- text run at (0,672) width 158: "accumsan pellentesque nibh"
- text run at (0,696) width 158: "metus non felis. Vivamus sed"
- text run at (0,720) width 158: "eros quis magna scelerisque"
- text run at (0,744) width 116: "ultrices ac eget velit. "
- text run at (116,744) width 42: "Nunc et"
- text run at (0,768) width 158: "odio ut velit posuere viverra."
- text run at (0,792) width 158: "Integer eu mi quis velit dapibus"
- text run at (0,816) width 158: "tempus at ut purus. Quisque"
- text run at (0,840) width 158: "congue mollis mauris a hendrerit."
- text run at (0,864) width 158: "Nam viverra est at orci interdum"
- text run at (0,888) width 158: "a ullamcorper mi dictum. In id"
- text run at (0,912) width 158: "sapien augue. Suspendisse"
- text run at (0,936) width 158: "potenti. Vestibulum turpis purus,"
- text run at (0,960) width 158: "convallis ut sagittis quis, semper"
- text run at (0,1003) width 158: "vel mauris. Curabitur vitae felis"
- text run at (0,1027) width 158: "turpis. Fusce augue nibh,"
- text run at (0,1051) width 158: "consectetur non vestibulum et,"
- text run at (0,1075) width 158: "bibendum sit amet lectus. Nulla"
- text run at (0,1099) width 158: "at imperdiet metus. Donec non"
- text run at (0,1123) width 158: "est velit, non fringilla ipsum."
- text run at (0,1147) width 158: "Fusce elementum neque a nibh"
- text run at (0,1171) width 158: "egestas sodales. Mauris ut lorem"
- text run at (0,1195) width 158: "hendrerit metus interdum"
- text run at (0,1219) width 158: "malesuada. Nam tempus sodales"
- text run at (0,1243) width 158: "neque vitae bibendum."
- text run at (0,1267) width 158: "Vestibulum ac est sit amet dolor"
- text run at (0,1291) width 158: "vehicula semper at sed ante."
- text run at (0,1315) width 158: "Nunc at neque urna, in volutpat"
- text run at (0,1339) width 158: "orci. Praesent eu velit neque, quis"
- text run at (0,1363) width 158: "rutrum metus. Nunc eu ipsum sit"
- text run at (0,1387) width 158: "amet ligula mattis porttitor sit"
- text run at (0,1411) width 158: "amet id felis. Integer volutpat"
</del><ins>+ RenderText {#text} at (0,5) size 159x1444
+ text run at (0,5) width 159: "Lorem ipsum dolor sit amet,"
+ text run at (0,29) width 159: "consectetur adipiscing elit."
+ text run at (0,53) width 159: "Nullam ornare, nunc eget"
+ text run at (0,77) width 159: "condimentum tempor, augue"
+ text run at (0,101) width 159: "ligula accumsan eros, sed"
+ text run at (0,125) width 159: "consequat sapien orci id libero."
+ text run at (0,149) width 159: "Curabitur tristique, augue in"
+ text run at (0,173) width 159: "aliquet accumsan, nibh nisi"
+ text run at (0,197) width 159: "lobortis odio, et suscipit est ligula"
+ text run at (0,221) width 159: "eu nisi. Nunc aliquet lobortis"
+ text run at (0,245) width 159: "porta. Donec venenatis"
+ text run at (0,269) width 159: "consectetur eleifend. Etiam sed"
+ text run at (0,293) width 159: "tempor quam. Pellentesque"
+ text run at (0,317) width 159: "gravida gravida eros venenatis"
+ text run at (0,341) width 159: "suscipit. Aenean diam enim,"
+ text run at (0,365) width 159: "suscipit id pellentesque vel,"
+ text run at (0,389) width 159: "hendrerit et metus. Suspendisse"
+ text run at (0,413) width 159: "felis erat, hendrerit a congue in,"
+ text run at (0,437) width 159: "euismod ac erat. Donec pulvinar"
+ text run at (0,461) width 159: "venenatis tortor, a lobortis erat"
+ text run at (0,504) width 159: "scelerisque et. Class aptent taciti"
+ text run at (0,528) width 159: "sociosqu ad litora torquent per"
+ text run at (0,552) width 159: "conubia nostra, per inceptos"
+ text run at (0,576) width 159: "himenaeos. Aliquam in orci id"
+ text run at (0,600) width 159: "felis mollis porta ac et orci."
+ text run at (0,624) width 159: "Donec viverra, eros ac mattis"
+ text run at (0,648) width 159: "dapibus, quam ante porta lectus,"
+ text run at (0,672) width 159: "accumsan pellentesque nibh"
+ text run at (0,696) width 159: "metus non felis. Vivamus sed"
+ text run at (0,720) width 159: "eros quis magna scelerisque"
+ text run at (0,744) width 117: "ultrices ac eget velit. "
+ text run at (116,744) width 43: "Nunc et"
+ text run at (0,768) width 159: "odio ut velit posuere viverra."
+ text run at (0,792) width 159: "Integer eu mi quis velit dapibus"
+ text run at (0,816) width 159: "tempus at ut purus. Quisque"
+ text run at (0,840) width 159: "congue mollis mauris a hendrerit."
+ text run at (0,864) width 159: "Nam viverra est at orci interdum"
+ text run at (0,888) width 159: "a ullamcorper mi dictum. In id"
+ text run at (0,912) width 159: "sapien augue. Suspendisse"
+ text run at (0,936) width 159: "potenti. Vestibulum turpis purus,"
+ text run at (0,960) width 159: "convallis ut sagittis quis, semper"
+ text run at (0,1003) width 159: "vel mauris. Curabitur vitae felis"
+ text run at (0,1027) width 159: "turpis. Fusce augue nibh,"
+ text run at (0,1051) width 159: "consectetur non vestibulum et,"
+ text run at (0,1075) width 159: "bibendum sit amet lectus. Nulla"
+ text run at (0,1099) width 159: "at imperdiet metus. Donec non"
+ text run at (0,1123) width 159: "est velit, non fringilla ipsum."
+ text run at (0,1147) width 159: "Fusce elementum neque a nibh"
+ text run at (0,1171) width 159: "egestas sodales. Mauris ut lorem"
+ text run at (0,1195) width 159: "hendrerit metus interdum"
+ text run at (0,1219) width 159: "malesuada. Nam tempus sodales"
+ text run at (0,1243) width 159: "neque vitae bibendum."
+ text run at (0,1267) width 159: "Vestibulum ac est sit amet dolor"
+ text run at (0,1291) width 159: "vehicula semper at sed ante."
+ text run at (0,1315) width 159: "Nunc at neque urna, in volutpat"
+ text run at (0,1339) width 159: "orci. Praesent eu velit neque, quis"
+ text run at (0,1363) width 159: "rutrum metus. Nunc eu ipsum sit"
+ text run at (0,1387) width 159: "amet ligula mattis porttitor sit"
+ text run at (0,1411) width 159: "amet id felis. Integer volutpat"
</ins><span class="cx"> text run at (0,1435) width 110: "aliquam odio et feugiat."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticoloverflowunsplittableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/overflow-unsplittable-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/overflow-unsplittable-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/overflow-unsplittable-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -9,71 +9,71 @@
</span><span class="cx"> layer at (11,11) size 159x1478 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
</span><span class="cx"> RenderMultiColumnFlowThread at (3,3) size 159x1478
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 159x360
</span><del>- RenderText {#text} at (0,5) size 158x350
- text run at (0,5) width 158: "Lorem ipsum dolor sit amet,"
- text run at (0,29) width 158: "consectetur adipiscing elit."
- text run at (0,53) width 158: "Nullam ornare, nunc eget"
- text run at (0,77) width 158: "condimentum tempor, augue"
- text run at (0,101) width 158: "ligula accumsan eros, sed"
- text run at (0,125) width 158: "consequat sapien orci id libero."
- text run at (0,149) width 158: "Curabitur tristique, augue in"
- text run at (0,173) width 158: "aliquet accumsan, nibh nisi"
- text run at (0,197) width 158: "lobortis odio, et suscipit est ligula"
- text run at (0,221) width 158: "eu nisi. Nunc aliquet lobortis"
- text run at (0,245) width 158: "porta. Donec venenatis"
- text run at (0,269) width 158: "consectetur eleifend. Etiam sed"
- text run at (0,293) width 158: "tempor quam. Pellentesque"
- text run at (0,317) width 158: "gravida gravida eros venenatis"
</del><ins>+ RenderText {#text} at (0,5) size 159x350
+ text run at (0,5) width 159: "Lorem ipsum dolor sit amet,"
+ text run at (0,29) width 159: "consectetur adipiscing elit."
+ text run at (0,53) width 159: "Nullam ornare, nunc eget"
+ text run at (0,77) width 159: "condimentum tempor, augue"
+ text run at (0,101) width 159: "ligula accumsan eros, sed"
+ text run at (0,125) width 159: "consequat sapien orci id libero."
+ text run at (0,149) width 159: "Curabitur tristique, augue in"
+ text run at (0,173) width 159: "aliquet accumsan, nibh nisi"
+ text run at (0,197) width 159: "lobortis odio, et suscipit est ligula"
+ text run at (0,221) width 159: "eu nisi. Nunc aliquet lobortis"
+ text run at (0,245) width 159: "porta. Donec venenatis"
+ text run at (0,269) width 159: "consectetur eleifend. Etiam sed"
+ text run at (0,293) width 159: "tempor quam. Pellentesque"
+ text run at (0,317) width 159: "gravida gravida eros venenatis"
</ins><span class="cx"> text run at (0,341) width 39: "suscipit."
</span><span class="cx"> RenderBlock (anonymous) at (0,803) size 159x675
</span><del>- RenderText {#text} at (0,5) size 158x665
- text run at (0,5) width 158: "Nunc et odio ut velit posuere"
- text run at (0,29) width 158: "viverra. Integer eu mi quis velit"
- text run at (0,53) width 158: "dapibus tempus at ut purus."
- text run at (0,77) width 158: "Quisque congue mollis mauris a"
- text run at (0,101) width 158: "hendrerit. Nam viverra est at orci"
- text run at (0,125) width 158: "interdum a ullamcorper mi"
- text run at (0,149) width 158: "dictum. In id sapien augue."
- text run at (0,173) width 158: "Suspendisse potenti. Vestibulum"
- text run at (0,200) width 158: "turpis purus, convallis ut sagittis"
- text run at (0,224) width 158: "quis, semper vel mauris."
- text run at (0,248) width 158: "Curabitur vitae felis turpis. Fusce"
- text run at (0,272) width 158: "augue nibh, consectetur non"
- text run at (0,296) width 158: "vestibulum et, bibendum sit amet"
- text run at (0,320) width 158: "lectus. Nulla at imperdiet metus."
- text run at (0,344) width 158: "Donec non est velit, non fringilla"
- text run at (0,368) width 158: "ipsum. Fusce elementum neque a"
- text run at (0,392) width 158: "nibh egestas sodales. Mauris ut"
- text run at (0,416) width 158: "lorem hendrerit metus interdum"
- text run at (0,440) width 158: "malesuada. Nam tempus sodales"
- text run at (0,464) width 158: "neque vitae bibendum."
- text run at (0,488) width 158: "Vestibulum ac est sit amet dolor"
- text run at (0,512) width 158: "vehicula semper at sed ante."
- text run at (0,536) width 158: "Nunc at neque urna, in volutpat"
- text run at (0,560) width 158: "orci. Praesent eu velit neque, quis"
- text run at (0,584) width 158: "rutrum metus. Nunc eu ipsum sit"
- text run at (0,608) width 158: "amet ligula mattis porttitor sit"
- text run at (0,632) width 158: "amet id felis. Integer volutpat"
</del><ins>+ RenderText {#text} at (0,5) size 159x665
+ text run at (0,5) width 159: "Nunc et odio ut velit posuere"
+ text run at (0,29) width 159: "viverra. Integer eu mi quis velit"
+ text run at (0,53) width 159: "dapibus tempus at ut purus."
+ text run at (0,77) width 159: "Quisque congue mollis mauris a"
+ text run at (0,101) width 159: "hendrerit. Nam viverra est at orci"
+ text run at (0,125) width 159: "interdum a ullamcorper mi"
+ text run at (0,149) width 159: "dictum. In id sapien augue."
+ text run at (0,173) width 159: "Suspendisse potenti. Vestibulum"
+ text run at (0,200) width 159: "turpis purus, convallis ut sagittis"
+ text run at (0,224) width 159: "quis, semper vel mauris."
+ text run at (0,248) width 159: "Curabitur vitae felis turpis. Fusce"
+ text run at (0,272) width 159: "augue nibh, consectetur non"
+ text run at (0,296) width 159: "vestibulum et, bibendum sit amet"
+ text run at (0,320) width 159: "lectus. Nulla at imperdiet metus."
+ text run at (0,344) width 159: "Donec non est velit, non fringilla"
+ text run at (0,368) width 159: "ipsum. Fusce elementum neque a"
+ text run at (0,392) width 159: "nibh egestas sodales. Mauris ut"
+ text run at (0,416) width 159: "lorem hendrerit metus interdum"
+ text run at (0,440) width 159: "malesuada. Nam tempus sodales"
+ text run at (0,464) width 159: "neque vitae bibendum."
+ text run at (0,488) width 159: "Vestibulum ac est sit amet dolor"
+ text run at (0,512) width 159: "vehicula semper at sed ante."
+ text run at (0,536) width 159: "Nunc at neque urna, in volutpat"
+ text run at (0,560) width 159: "orci. Praesent eu velit neque, quis"
+ text run at (0,584) width 159: "rutrum metus. Nunc eu ipsum sit"
+ text run at (0,608) width 159: "amet ligula mattis porttitor sit"
+ text run at (0,632) width 159: "amet id felis. Integer volutpat"
</ins><span class="cx"> text run at (0,656) width 110: "aliquam odio et feugiat."
</span><span class="cx"> layer at (11,510) size 159x304 backgroundClip at (11,510) size 159x90 clip at (13,512) size 140x88 outlineClip at (0,0) size 800x600 scrollHeight 456
</span><span class="cx"> RenderBlock {DIV} at (0,499) size 160x304 [border: (2px solid #000000)]
</span><del>- RenderText {#text} at (2,7) size 140x446
- text run at (2,7) width 140: "Aenean diam enim, suscipit"
- text run at (2,31) width 140: "id pellentesque vel, hendrerit"
- text run at (2,55) width 140: "et metus. Suspendisse felis"
- text run at (2,79) width 140: "erat, hendrerit a congue in,"
- text run at (2,103) width 140: "euismod ac erat. Donec"
- text run at (2,127) width 140: "pulvinar venenatis tortor, a"
- text run at (2,151) width 140: "lobortis erat scelerisque et."
- text run at (2,175) width 140: "Class aptent taciti sociosqu"
- text run at (2,199) width 140: "ad litora torquent per conubia"
- text run at (2,223) width 140: "nostra, per inceptos"
- text run at (2,247) width 140: "himenaeos. Aliquam in orci"
- text run at (2,271) width 140: "id felis mollis porta ac et orci."
- text run at (2,295) width 140: "Donec viverra, eros ac mattis"
- text run at (2,319) width 140: "dapibus, quam ante porta"
- text run at (2,343) width 140: "lectus, accumsan pellentesque"
- text run at (2,367) width 140: "nibh metus non felis."
- text run at (2,391) width 140: "Vivamus sed eros quis"
- text run at (2,415) width 140: "magna scelerisque ultrices ac"
</del><ins>+ RenderText {#text} at (2,7) size 141x446
+ text run at (2,7) width 141: "Aenean diam enim, suscipit"
+ text run at (2,31) width 141: "id pellentesque vel, hendrerit"
+ text run at (2,55) width 141: "et metus. Suspendisse felis"
+ text run at (2,79) width 141: "erat, hendrerit a congue in,"
+ text run at (2,103) width 141: "euismod ac erat. Donec"
+ text run at (2,127) width 141: "pulvinar venenatis tortor, a"
+ text run at (2,151) width 141: "lobortis erat scelerisque et."
+ text run at (2,175) width 141: "Class aptent taciti sociosqu"
+ text run at (2,199) width 141: "ad litora torquent per conubia"
+ text run at (2,223) width 141: "nostra, per inceptos"
+ text run at (2,247) width 141: "himenaeos. Aliquam in orci"
+ text run at (2,271) width 141: "id felis mollis porta ac et orci."
+ text run at (2,295) width 141: "Donec viverra, eros ac mattis"
+ text run at (2,319) width 141: "dapibus, quam ante porta"
+ text run at (2,343) width 141: "lectus, accumsan pellentesque"
+ text run at (2,367) width 141: "nibh metus non felis."
+ text run at (2,391) width 141: "Vivamus sed eros quis"
+ text run at (2,415) width 141: "magna scelerisque ultrices ac"
</ins><span class="cx"> text run at (2,439) width 45: "eget velit."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolpositiveleadingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/positive-leading-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/positive-leading-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/positive-leading-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -8,64 +8,64 @@
</span><span class="cx"> RenderMultiColumnSet at (3,3) size 500x499
</span><span class="cx"> layer at (11,11) size 159x1454 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
</span><span class="cx"> RenderMultiColumnFlowThread at (3,3) size 159x1454
</span><del>- RenderText {#text} at (0,5) size 158x1444
- text run at (0,5) width 158: "Lorem ipsum dolor sit amet,"
- text run at (0,29) width 158: "consectetur adipiscing elit."
- text run at (0,53) width 158: "Nullam ornare, nunc eget"
- text run at (0,77) width 158: "condimentum tempor, augue"
- text run at (0,101) width 158: "ligula accumsan eros, sed"
- text run at (0,125) width 158: "consequat sapien orci id libero."
- text run at (0,149) width 158: "Curabitur tristique, augue in"
- text run at (0,173) width 158: "aliquet accumsan, nibh nisi"
- text run at (0,197) width 158: "lobortis odio, et suscipit est ligula"
- text run at (0,221) width 158: "eu nisi. Nunc aliquet lobortis"
- text run at (0,245) width 158: "porta. Donec venenatis"
- text run at (0,269) width 158: "consectetur eleifend. Etiam sed"
- text run at (0,293) width 158: "tempor quam. Pellentesque"
- text run at (0,317) width 158: "gravida gravida eros venenatis"
- text run at (0,341) width 158: "suscipit. Aenean diam enim,"
- text run at (0,365) width 158: "suscipit id pellentesque vel,"
- text run at (0,389) width 158: "hendrerit et metus. Suspendisse"
- text run at (0,413) width 158: "felis erat, hendrerit a congue in,"
- text run at (0,437) width 158: "euismod ac erat. Donec pulvinar"
- text run at (0,461) width 158: "venenatis tortor, a lobortis erat"
- text run at (0,504) width 158: "scelerisque et. Class aptent taciti"
- text run at (0,528) width 158: "sociosqu ad litora torquent per"
- text run at (0,552) width 158: "conubia nostra, per inceptos"
- text run at (0,576) width 158: "himenaeos. Aliquam in orci id"
- text run at (0,600) width 158: "felis mollis porta ac et orci."
- text run at (0,624) width 158: "Donec viverra, eros ac mattis"
- text run at (0,648) width 158: "dapibus, quam ante porta lectus,"
- text run at (0,672) width 158: "accumsan pellentesque nibh"
- text run at (0,696) width 158: "metus non felis. Vivamus sed"
- text run at (0,720) width 158: "eros quis magna scelerisque"
- text run at (0,744) width 116: "ultrices ac eget velit. "
- text run at (116,744) width 42: "Nunc et"
- text run at (0,768) width 158: "odio ut velit posuere viverra."
- text run at (0,792) width 158: "Integer eu mi quis velit dapibus"
- text run at (0,816) width 158: "tempus at ut purus. Quisque"
- text run at (0,840) width 158: "congue mollis mauris a hendrerit."
- text run at (0,864) width 158: "Nam viverra est at orci interdum"
- text run at (0,888) width 158: "a ullamcorper mi dictum. In id"
- text run at (0,912) width 158: "sapien augue. Suspendisse"
- text run at (0,936) width 158: "potenti. Vestibulum turpis purus,"
- text run at (0,960) width 158: "convallis ut sagittis quis, semper"
- text run at (0,1003) width 158: "vel mauris. Curabitur vitae felis"
- text run at (0,1027) width 158: "turpis. Fusce augue nibh,"
- text run at (0,1051) width 158: "consectetur non vestibulum et,"
- text run at (0,1075) width 158: "bibendum sit amet lectus. Nulla"
- text run at (0,1099) width 158: "at imperdiet metus. Donec non"
- text run at (0,1123) width 158: "est velit, non fringilla ipsum."
- text run at (0,1147) width 158: "Fusce elementum neque a nibh"
- text run at (0,1171) width 158: "egestas sodales. Mauris ut lorem"
- text run at (0,1195) width 158: "hendrerit metus interdum"
- text run at (0,1219) width 158: "malesuada. Nam tempus sodales"
- text run at (0,1243) width 158: "neque vitae bibendum."
- text run at (0,1267) width 158: "Vestibulum ac est sit amet dolor"
- text run at (0,1291) width 158: "vehicula semper at sed ante."
- text run at (0,1315) width 158: "Nunc at neque urna, in volutpat"
- text run at (0,1339) width 158: "orci. Praesent eu velit neque, quis"
- text run at (0,1363) width 158: "rutrum metus. Nunc eu ipsum sit"
- text run at (0,1387) width 158: "amet ligula mattis porttitor sit"
- text run at (0,1411) width 158: "amet id felis. Integer volutpat"
</del><ins>+ RenderText {#text} at (0,5) size 159x1444
+ text run at (0,5) width 159: "Lorem ipsum dolor sit amet,"
+ text run at (0,29) width 159: "consectetur adipiscing elit."
+ text run at (0,53) width 159: "Nullam ornare, nunc eget"
+ text run at (0,77) width 159: "condimentum tempor, augue"
+ text run at (0,101) width 159: "ligula accumsan eros, sed"
+ text run at (0,125) width 159: "consequat sapien orci id libero."
+ text run at (0,149) width 159: "Curabitur tristique, augue in"
+ text run at (0,173) width 159: "aliquet accumsan, nibh nisi"
+ text run at (0,197) width 159: "lobortis odio, et suscipit est ligula"
+ text run at (0,221) width 159: "eu nisi. Nunc aliquet lobortis"
+ text run at (0,245) width 159: "porta. Donec venenatis"
+ text run at (0,269) width 159: "consectetur eleifend. Etiam sed"
+ text run at (0,293) width 159: "tempor quam. Pellentesque"
+ text run at (0,317) width 159: "gravida gravida eros venenatis"
+ text run at (0,341) width 159: "suscipit. Aenean diam enim,"
+ text run at (0,365) width 159: "suscipit id pellentesque vel,"
+ text run at (0,389) width 159: "hendrerit et metus. Suspendisse"
+ text run at (0,413) width 159: "felis erat, hendrerit a congue in,"
+ text run at (0,437) width 159: "euismod ac erat. Donec pulvinar"
+ text run at (0,461) width 159: "venenatis tortor, a lobortis erat"
+ text run at (0,504) width 159: "scelerisque et. Class aptent taciti"
+ text run at (0,528) width 159: "sociosqu ad litora torquent per"
+ text run at (0,552) width 159: "conubia nostra, per inceptos"
+ text run at (0,576) width 159: "himenaeos. Aliquam in orci id"
+ text run at (0,600) width 159: "felis mollis porta ac et orci."
+ text run at (0,624) width 159: "Donec viverra, eros ac mattis"
+ text run at (0,648) width 159: "dapibus, quam ante porta lectus,"
+ text run at (0,672) width 159: "accumsan pellentesque nibh"
+ text run at (0,696) width 159: "metus non felis. Vivamus sed"
+ text run at (0,720) width 159: "eros quis magna scelerisque"
+ text run at (0,744) width 117: "ultrices ac eget velit. "
+ text run at (116,744) width 43: "Nunc et"
+ text run at (0,768) width 159: "odio ut velit posuere viverra."
+ text run at (0,792) width 159: "Integer eu mi quis velit dapibus"
+ text run at (0,816) width 159: "tempus at ut purus. Quisque"
+ text run at (0,840) width 159: "congue mollis mauris a hendrerit."
+ text run at (0,864) width 159: "Nam viverra est at orci interdum"
+ text run at (0,888) width 159: "a ullamcorper mi dictum. In id"
+ text run at (0,912) width 159: "sapien augue. Suspendisse"
+ text run at (0,936) width 159: "potenti. Vestibulum turpis purus,"
+ text run at (0,960) width 159: "convallis ut sagittis quis, semper"
+ text run at (0,1003) width 159: "vel mauris. Curabitur vitae felis"
+ text run at (0,1027) width 159: "turpis. Fusce augue nibh,"
+ text run at (0,1051) width 159: "consectetur non vestibulum et,"
+ text run at (0,1075) width 159: "bibendum sit amet lectus. Nulla"
+ text run at (0,1099) width 159: "at imperdiet metus. Donec non"
+ text run at (0,1123) width 159: "est velit, non fringilla ipsum."
+ text run at (0,1147) width 159: "Fusce elementum neque a nibh"
+ text run at (0,1171) width 159: "egestas sodales. Mauris ut lorem"
+ text run at (0,1195) width 159: "hendrerit metus interdum"
+ text run at (0,1219) width 159: "malesuada. Nam tempus sodales"
+ text run at (0,1243) width 159: "neque vitae bibendum."
+ text run at (0,1267) width 159: "Vestibulum ac est sit amet dolor"
+ text run at (0,1291) width 159: "vehicula semper at sed ante."
+ text run at (0,1315) width 159: "Nunc at neque urna, in volutpat"
+ text run at (0,1339) width 159: "orci. Praesent eu velit neque, quis"
+ text run at (0,1363) width 159: "rutrum metus. Nunc eu ipsum sit"
+ text run at (0,1387) width 159: "amet ligula mattis porttitor sit"
+ text run at (0,1411) width 159: "amet id felis. Integer volutpat"
</ins><span class="cx"> text run at (0,1435) width 110: "aliquam odio et feugiat."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolverticallrfloatavoidanceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx"> RenderBlock {P} at (16,0) size 90x415
</span><span class="cx"> RenderText {#text} at (0,0) size 90x415
</span><span class="cx"> text run at (0,0) width 415: "This technology preview of our award winning next generation"
</span><del>- text run at (18,0) width 56: "browser "
</del><ins>+ text run at (18,0) width 57: "browser "
</ins><span class="cx"> text run at (18,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
</span><del>- text run at (36,0) width 122: "easy to use. This "
</del><ins>+ text run at (36,0) width 123: "easy to use. This "
</ins><span class="cx"> text run at (36,122) width 293: "maintenance release provides a few updates"
</span><del>- text run at (54,0) width 246: "based on user feedback - including "
</del><ins>+ text run at (54,0) width 247: "based on user feedback - including "
</ins><span class="cx"> text run at (54,246) width 169: "changes to the Extension"
</span><span class="cx"> text run at (72,0) width 201: "System and icon improvements."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlfloatavoidanceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx"> RenderBlock {P} at (16,0) size 90x415
</span><span class="cx"> RenderText {#text} at (0,0) size 90x415
</span><span class="cx"> text run at (0,0) width 415: "This technology preview of our award winning next generation"
</span><del>- text run at (18,0) width 56: "browser "
</del><ins>+ text run at (18,0) width 57: "browser "
</ins><span class="cx"> text run at (18,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
</span><del>- text run at (36,0) width 122: "easy to use. This "
</del><ins>+ text run at (36,0) width 123: "easy to use. This "
</ins><span class="cx"> text run at (36,122) width 293: "maintenance release provides a few updates"
</span><del>- text run at (54,0) width 246: "based on user feedback - including "
</del><ins>+ text run at (54,0) width 247: "based on user feedback - including "
</ins><span class="cx"> text run at (54,246) width 169: "changes to the Extension"
</span><span class="cx"> text run at (72,0) width 201: "System and icon improvements."
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastregionsmultipledirectionalitychangesinvariablewidthregionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -21,17 +21,17 @@
</span><span class="cx"> RenderBlock {DIV} at (27,15) size 396x342 [border: (1px solid #0000FF)]
</span><span class="cx"> RenderBlock {DIV} at (40,11) size 316x249 [border: (1px solid #008000)]
</span><span class="cx"> RenderBlock {P} at (1,17) size 314x93
</span><del>- RenderText {#text} at (-17,0) size 331x93
</del><ins>+ RenderText {#text} at (-17,0) size 332x93
</ins><span class="cx"> text run at (-17,0) width 248: "This line of text should not get out of"
</span><span class="cx"> text run at (-17,18) width 248: "the region. This line of text should not"
</span><span class="cx"> text run at (-17,36) width 248: "get out of the region. This line of text"
</span><del>- text run at (0,57) width 313: "should not get out of the region. This line of text"
</del><ins>+ text run at (0,57) width 314: "should not get out of the region. This line of text"
</ins><span class="cx"> text run at (0,75) width 201: "should not get out of the region."
</span><span class="cx"> RenderBlock {P} at (1,126) size 314x72
</span><del>- RenderText {#text} at (0,0) size 313x72
- text run at (0,0) width 313: "This line of text should not get out of the region."
- text run at (0,18) width 313: "This line of text should not get out of the region."
- text run at (0,36) width 313: "This line of text should not get out of the region."
</del><ins>+ RenderText {#text} at (0,0) size 314x72
+ text run at (0,0) width 314: "This line of text should not get out of the region."
+ text run at (0,18) width 314: "This line of text should not get out of the region."
+ text run at (0,36) width 314: "This line of text should not get out of the region."
</ins><span class="cx"> text run at (0,54) width 304: "This line of text should not get out of the region."
</span><span class="cx"> RenderBlock {P} at (1,214) size 314x18
</span><span class="cx"> RenderText {#text} at (0,0) size 304x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastregionsrepaintlineflowwithfloatsinregionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/regions/repaint/line-flow-with-floats-in-regions-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/regions/repaint/line-flow-with-floats-in-regions-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/regions/repaint/line-flow-with-floats-in-regions-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -21,41 +21,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 406x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><span class="cx"> text run at (6,78) width 176: "neck nicely straightened "
</span><span class="cx"> text run at (182,78) width 230: "out, and was going to give the"
</span><del>- text run at (6,96) width 224: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (230,96) size 39x18
- text run at (230,96) width 39: "would"
</del><ins>+ text run at (6,96) width 225: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (230,96) size 40x18
+ text run at (230,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (269,96) size 406x72
</span><span class="cx"> text run at (269,96) width 143: " twist itself round and"
</span><del>- text run at (6,114) width 175: "look up in her face, with "
</del><ins>+ text run at (6,114) width 176: "look up in her face, with "
</ins><span class="cx"> text run at (181,114) width 231: "such a puzzled expression that she"
</span><del>- text run at (6,132) width 179: "could not help bursting out "
</del><ins>+ text run at (6,132) width 180: "could not help bursting out "
</ins><span class="cx"> text run at (185,132) width 227: "laughing: and when she had got its"
</span><del>- text run at (6,150) width 229: "head down, and was going to "
</del><ins>+ text run at (6,150) width 230: "head down, and was going to "
</ins><span class="cx"> RenderText {#text} at (235,150) size 406x126
</span><span class="cx"> text run at (235,150) width 177: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,258) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 48x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 304x18
</span><span class="lines">@@ -64,16 +64,16 @@
</span><span class="cx"> RenderText {#text} at (57,312) size 355x36
</span><span class="cx"> text run at (57,312) width 64: "for turns, "
</span><span class="cx"> text run at (120,312) width 241: "quarrelling all the while, and fighting"
</span><del>- text run at (6,330) width 172: "for the hedgehogs; and in "
- text run at (178,330) width 116: "a very short time "
- RenderInline {SPAN} at (0,0) size 66x18
- RenderText {#text} at (294,330) size 66x18
- text run at (294,330) width 66: "the Queen"
- RenderText {#text} at (6,348) size 354x54
- text run at (6,348) width 226: "was in a furious passion, and went "
- text run at (232,348) width 128: "stamping about, and"
- text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (294,366) width 66: "her head!\x{2019}"
</del><ins>+ text run at (6,330) width 173: "for the hedgehogs; and in "
+ text run at (178,330) width 117: "a very short time "
+ RenderInline {SPAN} at (0,0) size 67x18
+ RenderText {#text} at (294,330) size 67x18
+ text run at (294,330) width 67: "the Queen"
+ RenderText {#text} at (6,348) size 355x54
+ text run at (6,348) width 227: "was in a furious passion, and went "
+ text run at (232,348) width 129: "stamping about, and"
+ text run at (6,366) width 289: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (294,366) width 67: "her head!\x{2019}"
</ins><span class="cx"> text run at (6,384) width 151: "about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-1-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 406x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><span class="cx"> text run at (6,78) width 176: "neck nicely straightened "
</span><span class="cx"> text run at (182,78) width 230: "out, and was going to give the"
</span><del>- text run at (6,96) width 224: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (230,96) size 39x18
- text run at (230,96) width 39: "would"
</del><ins>+ text run at (6,96) width 225: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (230,96) size 40x18
+ text run at (230,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (269,96) size 406x72
</span><span class="cx"> text run at (269,96) width 143: " twist itself round and"
</span><del>- text run at (6,114) width 175: "look up in her face, with "
</del><ins>+ text run at (6,114) width 176: "look up in her face, with "
</ins><span class="cx"> text run at (181,114) width 231: "such a puzzled expression that she"
</span><del>- text run at (6,132) width 179: "could not help bursting out "
</del><ins>+ text run at (6,132) width 180: "could not help bursting out "
</ins><span class="cx"> text run at (185,132) width 227: "laughing: and when she had got its"
</span><del>- text run at (6,150) width 229: "head down, and was going to "
</del><ins>+ text run at (6,150) width 230: "head down, and was going to "
</ins><span class="cx"> RenderText {#text} at (235,150) size 406x126
</span><span class="cx"> text run at (235,150) width 177: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,258) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 48x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 304x18
</span><span class="lines">@@ -57,16 +57,16 @@
</span><span class="cx"> RenderText {#text} at (57,312) size 355x36
</span><span class="cx"> text run at (57,312) width 64: "for turns, "
</span><span class="cx"> text run at (120,312) width 241: "quarrelling all the while, and fighting"
</span><del>- text run at (6,330) width 172: "for the hedgehogs; and in "
- text run at (178,330) width 116: "a very short time "
- RenderInline {SPAN} at (0,0) size 66x18
- RenderText {#text} at (294,330) size 66x18
- text run at (294,330) width 66: "the Queen"
- RenderText {#text} at (6,348) size 354x54
- text run at (6,348) width 226: "was in a furious passion, and went "
- text run at (232,348) width 128: "stamping about, and"
- text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (294,366) width 66: "her head!\x{2019}"
</del><ins>+ text run at (6,330) width 173: "for the hedgehogs; and in "
+ text run at (178,330) width 117: "a very short time "
+ RenderInline {SPAN} at (0,0) size 67x18
+ RenderText {#text} at (294,330) size 67x18
+ text run at (294,330) width 67: "the Queen"
+ RenderText {#text} at (6,348) size 355x54
+ text run at (6,348) width 227: "was in a furious passion, and went "
+ text run at (232,348) width 129: "stamping about, and"
+ text run at (6,366) width 289: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (294,366) width 67: "her head!\x{2019}"
</ins><span class="cx"> text run at (6,384) width 151: "about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats10expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,258) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,272) size 48x64 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 304x18
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx"> RenderText {#text} at (341,330) size 355x36
</span><span class="cx"> text run at (341,330) width 20: "the"
</span><span class="cx"> text run at (6,348) width 42: "Queen"
</span><del>- RenderText {#text} at (48,348) size 354x54
- text run at (48,348) width 255: " was in a furious passion, and went "
- text run at (303,348) width 57: "stamping"
- text run at (6,366) width 354: "about, and shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with"
</del><ins>+ RenderText {#text} at (48,348) size 355x54
+ text run at (48,348) width 256: " was in a furious passion, and went "
+ text run at (303,348) width 58: "stamping"
+ text run at (6,366) width 355: "about, and shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with"
</ins><span class="cx"> text run at (6,384) width 219: "her head!\x{2019} about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-2-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x502 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x111
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,99) width 235: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 44x22
- RenderText {#text} at (241,96) size 44x22
- text run at (241,96) width 44: "would"
</del><ins>+ text run at (6,99) width 236: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 45x22
+ RenderText {#text} at (241,96) size 45x22
+ text run at (241,96) width 45: "would"
</ins><span class="cx"> RenderText {#text} at (285,99) size 406x73
</span><span class="cx"> text run at (285,99) width 75: " twist itself"
</span><del>- text run at (6,118) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,118) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,118) width 169: "such a puzzled expression"
</span><del>- text run at (6,136) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,136) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,136) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,154) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,154) size 406x126
</span><span class="cx"> text run at (254,154) width 158: "begin again, it was very"
</span><del>- text run at (6,172) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,172) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,172) width 147: "unrolled itself, and was"
</span><del>- text run at (6,190) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,190) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,190) width 154: "this, there was generally"
</span><del>- text run at (6,208) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,208) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,208) width 150: "she wanted to send the"
</span><del>- text run at (6,226) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,226) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,226) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,244) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,244) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,262) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,265) size 48x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,262) size 355x36
- text run at (362,262) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,262) size 355x36
+ text run at (363,262) width 49: "difficult"
</ins><span class="cx"> text run at (57,280) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,298) size 304x18
</span><span class="lines">@@ -57,16 +57,16 @@
</span><span class="cx"> RenderText {#text} at (57,316) size 355x36
</span><span class="cx"> text run at (57,316) width 64: "for turns, "
</span><span class="cx"> text run at (120,316) width 241: "quarrelling all the while, and fighting"
</span><del>- text run at (6,334) width 172: "for the hedgehogs; and in "
- text run at (178,334) width 116: "a very short time "
- RenderInline {SPAN} at (0,0) size 66x18
- RenderText {#text} at (294,334) size 66x18
- text run at (294,334) width 66: "the Queen"
- RenderText {#text} at (6,352) size 354x54
- text run at (6,352) width 226: "was in a furious passion, and went "
- text run at (232,352) width 128: "stamping about, and"
- text run at (6,370) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (294,370) width 66: "her head!\x{2019}"
</del><ins>+ text run at (6,334) width 173: "for the hedgehogs; and in "
+ text run at (178,334) width 117: "a very short time "
+ RenderInline {SPAN} at (0,0) size 67x18
+ RenderText {#text} at (294,334) size 67x18
+ text run at (294,334) width 67: "the Queen"
+ RenderText {#text} at (6,352) size 355x54
+ text run at (6,352) width 227: "was in a furious passion, and went "
+ text run at (232,352) width 129: "stamping about, and"
+ text run at (6,370) width 289: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (294,370) width 67: "her head!\x{2019}"
</ins><span class="cx"> text run at (6,388) width 151: "about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,406) size 406x90
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> text run at (393,406) width 19: "yet"
</span><span class="cx"> text run at (6,424) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,442) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,460) width 75: "become of "
</del><ins>+ text run at (6,460) width 76: "become of "
</ins><span class="cx"> text run at (81,460) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,478) width 93: "here; the great "
</span><span class="cx"> text run at (99,478) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-3-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,258) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 48x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 298x18
</span><span class="lines">@@ -57,17 +57,17 @@
</span><span class="cx"> RenderText {#text} at (354,294) size 406x54
</span><span class="cx"> text run at (354,294) width 58: "for turns,"
</span><span class="cx"> text run at (57,312) width 288: "quarrelling all the while, and fighting for the"
</span><del>- text run at (6,330) width 119: "hedgehogs; and in "
- text run at (125,330) width 109: "a very short time "
- RenderInline {SPAN} at (0,0) size 65x18
- RenderText {#text} at (234,330) size 65x18
- text run at (234,330) width 65: "the Queen"
- RenderText {#text} at (299,330) size 338x72
- text run at (299,330) width 45: " was in"
- text run at (6,348) width 201: "a furious passion, and went "
- text run at (207,348) width 137: "stamping about, and"
- text run at (6,366) width 273: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (279,366) width 65: "her head!\x{2019}"
</del><ins>+ text run at (6,330) width 120: "hedgehogs; and in "
+ text run at (125,330) width 110: "a very short time "
+ RenderInline {SPAN} at (0,0) size 66x18
+ RenderText {#text} at (234,330) size 66x18
+ text run at (234,330) width 66: "the Queen"
+ RenderText {#text} at (299,330) size 339x72
+ text run at (299,330) width 46: " was in"
+ text run at (6,348) width 202: "a furious passion, and went "
+ text run at (207,348) width 138: "stamping about, and"
+ text run at (6,366) width 274: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (279,366) width 66: "her head!\x{2019}"
</ins><span class="cx"> text run at (6,384) width 151: "about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats4expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-4-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,258) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 48x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 304x18
</span><span class="lines">@@ -57,15 +57,15 @@
</span><span class="cx"> RenderText {#text} at (57,312) size 355x36
</span><span class="cx"> text run at (57,312) width 64: "for turns, "
</span><span class="cx"> text run at (120,312) width 241: "quarrelling all the while, and fighting"
</span><del>- text run at (6,330) width 172: "for the hedgehogs; and in "
- text run at (178,330) width 116: "a very short time "
- RenderInline {SPAN} at (0,0) size 66x18
- RenderText {#text} at (294,330) size 66x18
- text run at (294,330) width 66: "the Queen"
</del><ins>+ text run at (6,330) width 173: "for the hedgehogs; and in "
+ text run at (178,330) width 117: "a very short time "
+ RenderInline {SPAN} at (0,0) size 67x18
+ RenderText {#text} at (294,330) size 67x18
+ text run at (294,330) width 67: "the Queen"
</ins><span class="cx"> RenderText {#text} at (6,348) size 406x54
</span><del>- text run at (6,348) width 226: "was in a furious passion, and went "
- text run at (232,348) width 128: "stamping about, and"
- text run at (6,366) width 268: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
</del><ins>+ text run at (6,348) width 227: "was in a furious passion, and went "
+ text run at (232,348) width 129: "stamping about, and"
+ text run at (6,366) width 269: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
</ins><span class="cx"> text run at (274,366) width 138: "her head!\x{2019} about once"
</span><span class="cx"> text run at (6,384) width 78: "in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats5expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-5-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (41,258) width 322: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 32x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 371x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 371x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (41,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (41,294) size 302x18
</span><span class="lines">@@ -58,17 +58,17 @@
</span><span class="cx"> text run at (342,294) width 19: "for"
</span><span class="cx"> text run at (41,312) width 40: "turns, "
</span><span class="cx"> text run at (80,312) width 281: "quarrelling all the while, and fighting for the"
</span><del>- text run at (6,330) width 120: "hedgehogs; and in "
- text run at (126,330) width 111: "a very short time "
- RenderInline {SPAN} at (0,0) size 65x18
- RenderText {#text} at (237,330) size 65x18
- text run at (237,330) width 65: "the Queen"
- RenderText {#text} at (302,330) size 354x72
- text run at (302,330) width 58: " was in a"
- text run at (6,348) width 167: "furious passion, and went "
- text run at (173,348) width 187: "stamping about, and shouting"
- text run at (6,366) width 215: "\x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (221,366) width 139: "her head!\x{2019} about once"
</del><ins>+ text run at (6,330) width 121: "hedgehogs; and in "
+ text run at (126,330) width 112: "a very short time "
+ RenderInline {SPAN} at (0,0) size 67x18
+ RenderText {#text} at (237,330) size 67x18
+ text run at (237,330) width 67: "the Queen"
+ RenderText {#text} at (303,330) size 355x72
+ text run at (303,330) width 58: " was in a"
+ text run at (6,348) width 168: "furious passion, and went "
+ text run at (173,348) width 188: "stamping about, and shouting"
+ text run at (6,366) width 216: "\x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (221,366) width 140: "her head!\x{2019} about once"
</ins><span class="cx"> text run at (6,384) width 78: "in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats6expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-6-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,34 +14,34 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 48x65 [bgcolor=#ADD8E6]
</span><span class="cx"> RenderText {#text} at (13,0) size 22x18
</span><span class="cx"> text run at (13,0) width 22: "foo"
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 304x18
</span><span class="lines">@@ -59,16 +59,16 @@
</span><span class="cx"> RenderText {#text} at (57,312) size 355x36
</span><span class="cx"> text run at (57,312) width 64: "for turns, "
</span><span class="cx"> text run at (120,312) width 241: "quarrelling all the while, and fighting"
</span><del>- text run at (6,330) width 172: "for the hedgehogs; and in "
- text run at (178,330) width 116: "a very short time "
- RenderInline {SPAN} at (0,0) size 66x18
- RenderText {#text} at (294,330) size 66x18
- text run at (294,330) width 66: "the Queen"
- RenderText {#text} at (6,348) size 354x54
- text run at (6,348) width 226: "was in a furious passion, and went "
- text run at (232,348) width 128: "stamping about, and"
- text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (294,366) width 66: "her head!\x{2019}"
</del><ins>+ text run at (6,330) width 173: "for the hedgehogs; and in "
+ text run at (178,330) width 117: "a very short time "
+ RenderInline {SPAN} at (0,0) size 67x18
+ RenderText {#text} at (294,330) size 67x18
+ text run at (294,330) width 67: "the Queen"
+ RenderText {#text} at (6,348) size 355x54
+ text run at (6,348) width 227: "was in a furious passion, and went "
+ text run at (232,348) width 129: "stamping about, and"
+ text run at (6,366) width 289: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (294,366) width 67: "her head!\x{2019}"
</ins><span class="cx"> text run at (6,384) width 151: "about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-7-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,41 +14,41 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><span class="cx"> text run at (57,258) width 306: "soon came to the conclusion that it was a very "
</span><span class="cx"> RenderBlock (floating) {SPAN} at (6,261) size 48x65 [bgcolor=#ADD8E6]
</span><del>- RenderText {#text} at (362,258) size 355x36
- text run at (362,258) width 50: "difficult"
</del><ins>+ RenderText {#text} at (363,258) size 355x36
+ text run at (363,258) width 49: "difficult"
</ins><span class="cx"> text run at (57,276) width 89: "game indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (57,294) size 304x18
</span><span class="lines">@@ -57,16 +57,16 @@
</span><span class="cx"> RenderText {#text} at (57,312) size 355x36
</span><span class="cx"> text run at (57,312) width 64: "for turns, "
</span><span class="cx"> text run at (120,312) width 241: "quarrelling all the while, and fighting"
</span><del>- text run at (6,330) width 170: "for the hedgehogs; and in "
- text run at (176,330) width 114: "a very short time "
- RenderInline {SPAN} at (0,0) size 70x18
- RenderText {#text} at (290,330) size 70x18
- text run at (290,330) width 70: "the Queen"
- RenderText {#text} at (6,348) size 354x54
- text run at (6,348) width 226: "was in a furious passion, and went "
- text run at (232,348) width 128: "stamping about, and"
- text run at (6,366) width 288: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
- text run at (294,366) width 66: "her head!\x{2019}"
</del><ins>+ text run at (6,330) width 171: "for the hedgehogs; and in "
+ text run at (176,330) width 115: "a very short time "
+ RenderInline {SPAN} at (0,0) size 71x18
+ RenderText {#text} at (290,330) size 71x18
+ text run at (290,330) width 71: "the Queen"
+ RenderText {#text} at (6,348) size 355x54
+ text run at (6,348) width 227: "was in a furious passion, and went "
+ text run at (232,348) width 129: "stamping about, and"
+ text run at (6,366) width 289: "shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with "
+ text run at (294,366) width 67: "her head!\x{2019}"
</ins><span class="cx"> text run at (6,384) width 151: "about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats8expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-8-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,59 +14,59 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><span class="cx"> text run at (6,150) width 248: "got its head down, and was going to "
</span><span class="cx"> RenderText {#text} at (254,150) size 406x126
</span><span class="cx"> text run at (254,150) width 158: "begin again, it was very"
</span><del>- text run at (6,168) width 259: "provoking to find that the hedgehog had "
</del><ins>+ text run at (6,168) width 260: "provoking to find that the hedgehog had "
</ins><span class="cx"> text run at (265,168) width 147: "unrolled itself, and was"
</span><del>- text run at (6,186) width 252: "in the act of crawling away: besides all "
</del><ins>+ text run at (6,186) width 253: "in the act of crawling away: besides all "
</ins><span class="cx"> text run at (258,186) width 154: "this, there was generally"
</span><del>- text run at (6,204) width 256: "a ridge or furrow in the way wherever "
</del><ins>+ text run at (6,204) width 257: "a ridge or furrow in the way wherever "
</ins><span class="cx"> text run at (262,204) width 150: "she wanted to send the"
</span><del>- text run at (6,222) width 264: "hedgehog to, and, as the doubled-up "
</del><ins>+ text run at (6,222) width 265: "hedgehog to, and, as the doubled-up "
</ins><span class="cx"> text run at (270,222) width 142: "soldiers were always"
</span><span class="cx"> text run at (6,240) width 292: "getting up and walking off to other parts of "
</span><span class="cx"> text run at (298,240) width 114: "the ground, Alice"
</span><del>- text run at (6,258) width 316: "soon came to the conclusion that it was a very "
</del><ins>+ text run at (6,258) width 317: "soon came to the conclusion that it was a very "
</ins><span class="cx"> RenderText {#text} at (322,258) size 406x36
</span><span class="cx"> text run at (322,258) width 90: "difficult game"
</span><span class="cx"> text run at (6,276) width 50: "indeed. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (6,294) size 297x18
- text run at (6,294) width 297: "The players all played at once without waiting "
</del><ins>+ RenderText {#text} at (6,294) size 298x18
+ text run at (6,294) width 298: "The players all played at once without waiting "
</ins><span class="cx"> RenderBlock (floating) {SPAN} at (364,297) size 48x81 [bgcolor=#90EE90]
</span><del>- RenderText {#text} at (303,294) size 354x54
- text run at (303,294) width 57: "for turns,"
- text run at (6,312) width 354: "quarrelling all the while, and fighting for the hedgehogs;"
- text run at (6,330) width 49: "and in "
- text run at (55,330) width 121: "a very short time "
- RenderInline {SPAN} at (0,0) size 68x18
- RenderText {#text} at (176,330) size 68x18
- text run at (176,330) width 68: "the Queen"
- RenderText {#text} at (244,330) size 354x72
- text run at (244,330) width 116: " was in a furious"
- text run at (6,348) width 126: "passion, and went "
- text run at (132,348) width 228: "stamping about, and shouting \x{2018}Off"
- text run at (6,366) width 184: "with his head!\x{2019} or \x{2018}Off with "
- text run at (190,366) width 170: "her head!\x{2019} about once in a"
</del><ins>+ RenderText {#text} at (303,294) size 355x54
+ text run at (303,294) width 58: "for turns,"
+ text run at (6,312) width 355: "quarrelling all the while, and fighting for the hedgehogs;"
+ text run at (6,330) width 50: "and in "
+ text run at (55,330) width 122: "a very short time "
+ RenderInline {SPAN} at (0,0) size 69x18
+ RenderText {#text} at (176,330) size 69x18
+ text run at (176,330) width 69: "the Queen"
+ RenderText {#text} at (244,330) size 355x72
+ text run at (244,330) width 117: " was in a furious"
+ text run at (6,348) width 127: "passion, and went "
+ text run at (132,348) width 229: "stamping about, and shouting \x{2018}Off"
+ text run at (6,366) width 185: "with his head!\x{2019} or \x{2018}Off with "
+ text run at (190,366) width 171: "her head!\x{2019} about once in a"
</ins><span class="cx"> text run at (6,384) width 51: "minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintlineflowwithfloats9expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-9-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -14,31 +14,31 @@
</span><span class="cx"> RenderBlock {P} at (0,66) size 418x498 [border: (3px solid #800000)]
</span><span class="cx"> RenderText {#text} at (6,6) size 354x108
</span><span class="cx"> text run at (6,6) width 354: "The chief difficulty Alice found at first was in managing"
</span><del>- text run at (6,24) width 25: "her "
</del><ins>+ text run at (6,24) width 26: "her "
</ins><span class="cx"> text run at (31,24) width 329: "flamingo: she succeeded in getting its body tucked"
</span><del>- text run at (6,42) width 42: "away, "
</del><ins>+ text run at (6,42) width 43: "away, "
</ins><span class="cx"> text run at (48,42) width 312: "comfortably enough, under her arm, with its legs"
</span><del>- text run at (6,60) width 106: "hanging down, "
</del><ins>+ text run at (6,60) width 107: "hanging down, "
</ins><span class="cx"> text run at (112,60) width 248: "but generally, just as she had got its"
</span><del>- text run at (6,78) width 158: "neck nicely straightened "
</del><ins>+ text run at (6,78) width 159: "neck nicely straightened "
</ins><span class="cx"> text run at (164,78) width 196: "out, and was going to give the"
</span><del>- text run at (6,96) width 239: "hedgehog a blow with its head, it "
- RenderInline {I} at (0,0) size 39x18
- RenderText {#text} at (245,96) size 39x18
- text run at (245,96) width 39: "would"
</del><ins>+ text run at (6,96) width 240: "hedgehog a blow with its head, it "
+ RenderInline {I} at (0,0) size 40x18
+ RenderText {#text} at (245,96) size 40x18
+ text run at (245,96) width 40: "would"
</ins><span class="cx"> RenderText {#text} at (284,96) size 406x72
</span><span class="cx"> text run at (284,96) width 76: " twist itself"
</span><del>- text run at (6,114) width 237: "round and look up in her face, with "
</del><ins>+ text run at (6,114) width 238: "round and look up in her face, with "
</ins><span class="cx"> text run at (243,114) width 169: "such a puzzled expression"
</span><del>- text run at (6,132) width 227: "that she could not help bursting out "
</del><ins>+ text run at (6,132) width 228: "that she could not help bursting out "
</ins><span class="cx"> text run at (233,132) width 179: "laughing: and when she had"
</span><del>- text run at (6,150) width 235: "got its head down, and was going to "
</del><ins>+ text run at (6,150) width 236: "got its head down, and was going to "
</ins><span class="cx"> RenderBlock (floating) {SPAN} at (364,153) size 48x49 [bgcolor=#FFFFE0]
</span><span class="cx"> RenderText {#text} at (241,150) size 406x126
</span><del>- text run at (241,150) width 119: "begin again, it was"
- text run at (6,168) width 302: "very provoking to find that the hedgehog had "
- text run at (308,168) width 52: "unrolled"
- text run at (6,186) width 354: "itself, and was in the act of crawling away: besides all"
</del><ins>+ text run at (241,150) width 120: "begin again, it was"
+ text run at (6,168) width 303: "very provoking to find that the hedgehog had "
+ text run at (308,168) width 53: "unrolled"
+ text run at (6,186) width 355: "itself, and was in the act of crawling away: besides all"
</ins><span class="cx"> text run at (6,204) width 406: "this, there was generally a ridge or furrow in the way wherever"
</span><span class="cx"> text run at (6,222) width 406: "she wanted to send the hedgehog to, and, as the doubled-up"
</span><span class="cx"> text run at (6,240) width 406: "soldiers were always getting up and walking off to other parts of"
</span><span class="lines">@@ -59,10 +59,10 @@
</span><span class="cx"> RenderText {#text} at (341,330) size 355x36
</span><span class="cx"> text run at (341,330) width 20: "the"
</span><span class="cx"> text run at (6,348) width 42: "Queen"
</span><del>- RenderText {#text} at (48,348) size 354x54
- text run at (48,348) width 255: " was in a furious passion, and went "
- text run at (303,348) width 57: "stamping"
- text run at (6,366) width 354: "about, and shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with"
</del><ins>+ RenderText {#text} at (48,348) size 355x54
+ text run at (48,348) width 256: " was in a furious passion, and went "
+ text run at (303,348) width 58: "stamping"
+ text run at (6,366) width 355: "about, and shouting \x{2018}Off with his head!\x{2019} or \x{2018}Off with"
</ins><span class="cx"> text run at (6,384) width 219: "her head!\x{2019} about once in a minute. "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (6,402) size 406x90
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> text run at (393,402) width 19: "yet"
</span><span class="cx"> text run at (6,420) width 406: "had any dispute with the Queen, but she knew that it might"
</span><span class="cx"> text run at (6,438) width 406: "happen any minute, \x{2018}and then,\x{2019} thought she, \x{2018}what would"
</span><del>- text run at (6,456) width 75: "become of "
</del><ins>+ text run at (6,456) width 76: "become of "
</ins><span class="cx"> text run at (81,456) width 331: "me? They\x{2019}re dreadfully fond of beheading people"
</span><span class="cx"> text run at (6,474) width 93: "here; the great "
</span><span class="cx"> text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubybopomoforlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> RenderRubyRun (anonymous) at (0,256) size 48x32
</span><span class="cx"> RenderRubyText {RT} at (0,0) size 8x32
</span><span class="cx"> RenderText {#text} at (0,1) size 8x30
</span><del>- text run at (0,1) width 29: "\x{3112}\x{3127}\x{3123}"
</del><ins>+ text run at (0,1) width 30: "\x{3112}\x{3127}\x{3123}"
</ins><span class="cx"> RenderRubyBase (anonymous) at (0,0) size 48x32
</span><span class="cx"> RenderText {#text} at (8,0) size 32x32
</span><span class="cx"> text run at (8,0) width 32: "\x{5FC3}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexthyphenatecharacterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/hyphenate-character-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/hyphenate-character-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/text/hyphenate-character-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> text run at (7,117) width 226: "with its legs hanging down, "
</span><span class="cx"> text run at (233,117) width 104: "but generally,"
</span><span class="cx"> text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "-"
</span><del>- text run at (7,161) width 41: "ened "
</del><ins>+ text run at (7,161) width 42: "ened "
</ins><span class="cx"> text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "-"
</span><span class="cx"> text run at (7,183) width 204: "hog a blow with its head, it "
</span><span class="cx"> text run at (211,183) width 126: "would twist itself"
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> text run at (7,117) width 226: "with its legs hanging down, "
</span><span class="cx"> text run at (233,117) width 104: "but generally,"
</span><span class="cx"> text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "-"
</span><del>- text run at (7,161) width 41: "ened "
</del><ins>+ text run at (7,161) width 42: "ened "
</ins><span class="cx"> text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "-"
</span><span class="cx"> text run at (7,183) width 204: "hog a blow with its head, it "
</span><span class="cx"> text run at (211,183) width 126: "would twist itself"
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> text run at (7,117) width 226: "with its legs hanging down, "
</span><span class="cx"> text run at (233,117) width 104: "but generally,"
</span><span class="cx"> text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "\x{2022}"
</span><del>- text run at (7,161) width 41: "ened "
</del><ins>+ text run at (7,161) width 42: "ened "
</ins><span class="cx"> text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "\x{2022}"
</span><span class="cx"> text run at (7,183) width 204: "hog a blow with its head, it "
</span><span class="cx"> text run at (211,183) width 126: "would twist itself"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexthyphensexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/hyphens-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/hyphens-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/text/hyphens-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> text run at (7,117) width 307: "arm, with its legs hanging down, "
</span><span class="cx"> text run at (314,117) width 23: "but"
</span><span class="cx"> text run at (7,139) width 330: "generally, just as she had got its neck nicely"
</span><del>- text run at (7,161) width 95: "straightened "
</del><ins>+ text run at (7,161) width 96: "straightened "
</ins><span class="cx"> text run at (102,161) width 235: "out, and was going to give the"
</span><span class="cx"> text run at (7,183) width 285: "hedgehog a blow with its head, it "
</span><span class="cx"> text run at (292,183) width 45: "would"
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> text run at (7,117) width 307: "arm, with its legs hanging down, "
</span><span class="cx"> text run at (314,117) width 23: "but"
</span><span class="cx"> text run at (7,139) width 330: "generally, just as she had got its neck nicely"
</span><del>- text run at (7,161) width 95: "straight\x{AD}ened "
</del><ins>+ text run at (7,161) width 96: "straight\x{AD}ened "
</ins><span class="cx"> text run at (102,161) width 235: "out, and was going to give the"
</span><span class="cx"> text run at (7,183) width 285: "hedge\x{AD}hog a blow with its head, it "
</span><span class="cx"> text run at (292,183) width 45: "would"
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> text run at (7,117) width 226: "with its legs hanging down, "
</span><span class="cx"> text run at (233,117) width 104: "but generally,"
</span><span class="cx"> text run at (7,139) width 330: "just as she had got its neck nicely straight\x{AD}" + hyphen string "-"
</span><del>- text run at (7,161) width 41: "ened "
</del><ins>+ text run at (7,161) width 42: "ened "
</ins><span class="cx"> text run at (48,161) width 289: "out, and was going to give the hedge\x{AD}" + hyphen string "-"
</span><span class="cx"> text run at (7,183) width 204: "hog a blow with its head, it "
</span><span class="cx"> text run at (211,183) width 126: "would twist itself"
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> text run at (7,117) width 226: "with its legs hanging down, "
</span><span class="cx"> text run at (233,117) width 104: "but generally,"
</span><span class="cx"> text run at (7,139) width 330: "just as she had got its neck nicely straight" + hyphen string "-"
</span><del>- text run at (7,161) width 41: "ened "
</del><ins>+ text run at (7,161) width 42: "ened "
</ins><span class="cx"> text run at (48,161) width 289: "out, and was going to give the hedge" + hyphen string "-"
</span><span class="cx"> text run at (7,183) width 204: "hog a blow with its head, it "
</span><span class="cx"> text run at (211,183) width 126: "would twist itself"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextjustifiedselectionatedgeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/justified-selection-at-edge-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/justified-selection-at-edge-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/text/justified-selection-at-edge-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 251x18
</span><span class="cx"> text run at (0,0) width 251: "The two blue boxes should be identical."
</span><span class="cx"> RenderBlock {DIV} at (0,68) size 256x42 [border: (3px solid #0000FF)]
</span><del>- RenderText {#text} at (3,3) size 189x18
- text run at (3,3) width 189: "Lorem ipsum dolor si"
</del><ins>+ RenderText {#text} at (3,3) size 190x18
+ text run at (3,3) width 190: "Lorem ipsum dolor si"
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 61x18 [color=#008000] [bgcolor=#FFFF00]
</span><span class="cx"> RenderText {#text} at (192,3) size 61x18
</span><span class="cx"> text run at (192,3) width 61: "t amet,"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextjustifyideographleadingexpansionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/justify-ideograph-leading-expansion-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/justify-ideograph-leading-expansion-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/text/justify-ideograph-leading-expansion-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -5,11 +5,11 @@
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 784x154
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 106x54 [border: (3px solid #000000)]
</span><del>- RenderText {#text} at (3,6) size 65x17
- text run at (3,6) width 65: "a. b. "
- RenderInline {SPAN} at (0,0) size 5x17
- RenderText {#text} at (68,6) size 5x17
- text run at (68,6) width 5: "i"
</del><ins>+ RenderText {#text} at (3,6) size 66x17
+ text run at (3,6) width 66: "a. b. "
+ RenderInline {SPAN} at (0,0) size 6x17
+ RenderText {#text} at (68,6) size 6x17
+ text run at (68,6) width 6: "i"
</ins><span class="cx"> RenderText {#text} at (73,6) size 100x41
</span><span class="cx"> text run at (73,6) width 30: "\x{306F}"
</span><span class="cx"> text run at (3,30) width 63: "xxxxxxx"
</span><span class="lines">@@ -22,11 +22,11 @@
</span><span class="cx"> text run at (3,6) width 237: "xxxxxxxxxxxxxxxxxxxxx\x{FF08}\x{624B}\x{FF09}"
</span><span class="cx"> RenderBlock {DIV} at (0,162) size 784x154
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 106x54 [border: (3px solid #000000)]
</span><del>- RenderText {#text} at (3,6) size 65x17
- text run at (3,6) width 65: "a. b. "
- RenderInline {SPAN} at (0,0) size 5x17
- RenderText {#text} at (68,6) size 5x17
- text run at (68,6) width 5: "i"
</del><ins>+ RenderText {#text} at (3,6) size 66x17
+ text run at (3,6) width 66: "a. b. "
+ RenderInline {SPAN} at (0,0) size 6x17
+ RenderText {#text} at (68,6) size 6x17
+ text run at (68,6) width 6: "i"
</ins><span class="cx"> RenderText {#text} at (73,6) size 100x41
</span><span class="cx"> text run at (73,6) width 30: "\x{306F}"
</span><span class="cx"> text run at (3,30) width 63: "xxxxxxx"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextjustifynbspexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/justify-nbsp-expected.txt (0 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/justify-nbsp-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/justify-nbsp-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 656x206 [border: (3px solid #0000FF)]
+ RenderInline {SPAN} at (0,0) size 358x25
+ RenderText {#text} at (3,15) size 358x25
+ text run at (3,15) width 358: "a b c d "
+ RenderText {#text} at (360,15) size 650x75
+ text run at (360,15) width 293: "e f g h"
+ text run at (3,65) width 300: "xxxxxxxxxxx "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 358x25
+ RenderText {#text} at (3,115) size 358x25
+ text run at (3,115) width 358: "a b c d "
+ RenderText {#text} at (360,115) size 650x75
+ text run at (360,115) width 293: "e f g h"
+ text run at (3,165) width 275: "xxxxxxxxxxx"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexttrailingwhitespace2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-2-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-2-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-2-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 200x23
</span><span class="cx"> text run at (0,0) width 200: "Lorem ipsum dolor"
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 200x46 [bgcolor=#FFC0CB]
</span><del>- RenderText {#text} at (199,0) size 200x46
- text run at (199,0) width 1: " "
</del><ins>+ RenderText {#text} at (200,0) size 200x46
+ text run at (200,0) width 0: " "
</ins><span class="cx"> text run at (0,23) width 79: "sit amet"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock (floating) {DIV} at (224,70) size 200x46 [bgcolor=#FFFFE0]
</span><span class="lines">@@ -102,8 +102,8 @@
</span><span class="cx"> text run at (0,0) width 156: "Lorem ipsum "
</span><span class="cx"> text run at (155,0) width 45 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}"
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 200x46 [bgcolor=#FFC0CB]
</span><del>- RenderText {#text} at (199,0) size 200x46
- text run at (199,0) width 1: " "
</del><ins>+ RenderText {#text} at (200,0) size 200x46
+ text run at (200,0) width 0: " "
</ins><span class="cx"> text run at (0,23) width 40 RTL: "\x{5E9}\x{5DC}\x{5D2}\x{5D9}"
</span><span class="cx"> text run at (39,23) width 56: " amet"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexttrailingwhitespaceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> RenderBlock (floating) {DIV} at (8,70) size 200x46 [bgcolor=#FFFFE0]
</span><span class="cx"> RenderText {#text} at (0,0) size 200x46
</span><span class="cx"> text run at (0,0) width 200: "Lorem ipsum dolor"
</span><del>- text run at (199,0) width 1: " "
</del><ins>+ text run at (200,0) width 0: " "
</ins><span class="cx"> text run at (0,23) width 79: "sit amet"
</span><span class="cx"> RenderBlock (floating) {DIV} at (224,70) size 200x46 [bgcolor=#FFFFE0]
</span><span class="cx"> RenderText {#text} at (0,0) size 185x46
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 200x46
</span><span class="cx"> text run at (0,0) width 156: "Lorem ipsum "
</span><span class="cx"> text run at (155,0) width 45 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}"
</span><del>- text run at (199,0) width 1: " "
</del><ins>+ text run at (200,0) width 0: " "
</ins><span class="cx"> text run at (0,23) width 40 RTL: "\x{5E9}\x{5DC}\x{5D2}\x{5D9}"
</span><span class="cx"> text run at (39,23) width 56: " amet"
</span><span class="cx"> RenderBlock (floating) {DIV} at (8,256) size 200x46 [bgcolor=#FFFFE0]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_tbody_align_justifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> RenderTableCell {td} at (2,0) size 294x94 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 290x90
</span><span class="cx"> text run at (2,2) width 290: "This TBODY text should be justified which"
</span><del>- text run at (2,20) width 136: "means that the right "
</del><ins>+ text run at (2,20) width 137: "means that the right "
</ins><span class="cx"> text run at (138,20) width 154: "and left margins should"
</span><span class="cx"> text run at (2,38) width 290: "line up, no matter how long the content"
</span><span class="cx"> text run at (2,56) width 290: "becomes (except the last line which should be"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_td_align_justifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_justify-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> RenderTableRow {tr} at (0,2) size 782x76
</span><span class="cx"> RenderTableCell {td} at (2,2) size 388x76 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 384x72
</span><del>- text run at (2,2) width 212: "This cell text should be justified "
</del><ins>+ text run at (2,2) width 213: "This cell text should be justified "
</ins><span class="cx"> text run at (214,2) width 172: "which means that the right"
</span><del>- text run at (2,20) width 247: "and left margins should line up, no "
</del><ins>+ text run at (2,20) width 248: "and left margins should line up, no "
</ins><span class="cx"> text run at (249,20) width 137: "matter how long the"
</span><del>- text run at (2,38) width 294: "content becomes (except the last line which "
</del><ins>+ text run at (2,38) width 295: "content becomes (except the last line which "
</ins><span class="cx"> text run at (296,38) width 90: "should be left"
</span><span class="cx"> text run at (2,56) width 51: "aligned)"
</span><span class="cx"> RenderTableCell {td} at (392,29) size 388x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_tfoot_align_justifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> RenderTableCell {td} at (2,0) size 294x94 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 290x90
</span><span class="cx"> text run at (2,2) width 290: "This TFOOT text should be justified which"
</span><del>- text run at (2,20) width 136: "means that the right "
</del><ins>+ text run at (2,20) width 137: "means that the right "
</ins><span class="cx"> text run at (138,20) width 154: "and left margins should"
</span><span class="cx"> text run at (2,38) width 290: "line up, no matter how long the content"
</span><span class="cx"> text run at (2,56) width 290: "becomes (except the last line which should be"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_th_align_justifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_justify-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> RenderText {#text} at (2,2) size 384x72
</span><span class="cx"> text run at (2,2) width 232: "This cell text should be justified "
</span><span class="cx"> text run at (234,2) width 152: "which means that the"
</span><del>- text run at (2,20) width 302: "right and left margins should line up, no "
</del><ins>+ text run at (2,20) width 303: "right and left margins should line up, no "
</ins><span class="cx"> text run at (304,20) width 82: "matter how"
</span><span class="cx"> text run at (2,38) width 384: "long the content becomes (except the last line which"
</span><span class="cx"> text run at (2,56) width 148: "should be left aligned)"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_thead_align_justifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> RenderTableCell {td} at (2,2) size 294x94 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 290x90
</span><span class="cx"> text run at (2,2) width 290: "This THEAD text should be justified which"
</span><del>- text run at (2,20) width 136: "means that the right "
</del><ins>+ text run at (2,20) width 137: "means that the right "
</ins><span class="cx"> text run at (138,20) width 154: "and left margins should"
</span><span class="cx"> text run at (2,38) width 290: "line up, no matter how long the content"
</span><span class="cx"> text run at (2,56) width 290: "becomes (except the last line which should be"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillamarvinx_tr_align_justifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_justify-expected.txt 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> RenderTableCell {td} at (2,2) size 296x76 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 292x72
</span><span class="cx"> text run at (2,2) width 292: "Cell text should be justified which means that"
</span><del>- text run at (2,20) width 89: "the right and "
</del><ins>+ text run at (2,20) width 90: "the right and "
</ins><span class="cx"> text run at (91,20) width 203: "left margins should line up, no"
</span><span class="cx"> text run at (2,38) width 246: "matter how long the content becomes "
</span><span class="cx"> text run at (248,38) width 46: "(except"
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> RenderTableCell {td} at (300,2) size 296x76 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 292x72
</span><span class="cx"> text run at (2,2) width 292: "Cell text should be justified which means that"
</span><del>- text run at (2,20) width 89: "the right and "
</del><ins>+ text run at (2,20) width 90: "the right and "
</ins><span class="cx"> text run at (91,20) width 203: "left margins should line up, no"
</span><span class="cx"> text run at (2,38) width 246: "matter how long the content becomes "
</span><span class="cx"> text run at (248,38) width 46: "(except"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/Source/WebCore/ChangeLog 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-10-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Subpixel] Use floats instead of ints for text justification expansion
+ https://bugs.webkit.org/show_bug.cgi?id=137327
+
+ Reviewed by Zalan Bujtas.
+
+ Use a float instead of an int for the expansion variable in InlineBox. The int was inside an inner class
+ that held a collection of bitfields, and this patch removes that inner-inner variable.
+
+ No new tests because there is plenty of existing coverage and existing tests are rebaselined.
+
+ * rendering/InlineBox.cpp: Update static_assert for the size of InlineBox.
+ * rendering/InlineBox.h: Use a float for the justification expansion amount instead of an int bitfield.
+ (WebCore::InlineBox::InlineBoxBitfields::InlineBoxBitfields): Remove int bitfield.
+ (WebCore::InlineBox::InlineBox): Initialize float expansion.
+ (WebCore::InlineBox::expansion): Return a float.
+ (WebCore::InlineBox::setExpansion): Take a float.
+ (WebCore::InlineBox::InlineBoxBitfields::expansion): Deleted. Moved to InlineBox.
+ (WebCore::InlineBox::InlineBoxBitfields::setExpansion): Deleted. Ditto.
+ * rendering/InlineTextBox.h:
+ (WebCore::InlineTextBox::setExpansion): Take a float.
+
</ins><span class="cx"> 2014-10-02 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Move PageOverlay[Controller] to WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.cpp 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> virtual ~SameSizeAsInlineBox() { }
</span><span class="cx"> void* a[4];
</span><span class="cx"> FloatPoint b;
</span><del>- float c;
- uint32_t d : 32;
</del><ins>+ float c[2];
+ unsigned d : 20;
</ins><span class="cx"> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
</span><span class="cx"> unsigned s;
</span><span class="cx"> bool f;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.h (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.h 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -243,8 +243,6 @@
</span><span class="cx"> void invalidateParentChildList();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- int expansion() const { return m_bitfields.expansion(); }
-
</del><span class="cx"> bool visibleToHitTesting() const { return renderer().style().visibility() == VISIBLE && renderer().style().pointerEvents() != PE_NONE; }
</span><span class="cx">
</span><span class="cx"> const RenderStyle& lineStyle() const { return m_bitfields.firstLine() ? renderer().firstLineStyle() : renderer().style(); }
</span><span class="lines">@@ -308,7 +306,6 @@
</span><span class="cx"> , m_behavesLikeText(false)
</span><span class="cx"> , m_determinedIfNextOnLineExists(false)
</span><span class="cx"> , m_nextOnLineExists(false)
</span><del>- , m_expansion(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,17 +348,11 @@
</span><span class="cx"> public:
</span><span class="cx"> bool nextOnLineExists() const { return m_nextOnLineExists; }
</span><span class="cx"> void setNextOnLineExists(bool nextOnLineExists) const { m_nextOnLineExists = nextOnLineExists; }
</span><del>-
- private:
- signed m_expansion : 12; // for justified text
-
- public:
- signed expansion() const { return m_expansion; }
- void setExpansion(signed expansion) { m_expansion = expansion; }
</del><span class="cx"> };
</span><span class="cx"> #undef ADD_BOOLEAN_BITFIELD
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ float m_expansion;
</ins><span class="cx"> InlineBoxBitfields m_bitfields;
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -371,6 +362,7 @@
</span><span class="cx"> , m_parent(nullptr)
</span><span class="cx"> , m_renderer(renderer)
</span><span class="cx"> , m_logicalWidth(0)
</span><ins>+ , m_expansion(0)
</ins><span class="cx"> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
</span><span class="cx"> , m_deletionSentinel(deletionSentinelNotDeletedValue)
</span><span class="cx"> , m_hasBadParent(false)
</span><span class="lines">@@ -378,14 +370,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InlineBox(RenderObject& renderer, FloatPoint topLeft, float logicalWidth, bool firstLine, bool constructed,
- bool dirty, bool extracted, bool isHorizontal, InlineBox* next, InlineBox* prev, InlineFlowBox* parent)
</del><ins>+ InlineBox(RenderObject& renderer, FloatPoint topLeft, float logicalWidth, bool firstLine, bool constructed, bool dirty, bool extracted, bool isHorizontal, InlineBox* next, InlineBox* prev, InlineFlowBox* parent)
</ins><span class="cx"> : m_next(next)
</span><span class="cx"> , m_prev(prev)
</span><span class="cx"> , m_parent(parent)
</span><span class="cx"> , m_renderer(renderer)
</span><span class="cx"> , m_topLeft(topLeft)
</span><span class="cx"> , m_logicalWidth(logicalWidth)
</span><ins>+ , m_expansion(0)
</ins><span class="cx"> , m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal)
</span><span class="cx"> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
</span><span class="cx"> , m_deletionSentinel(deletionSentinelNotDeletedValue)
</span><span class="lines">@@ -407,8 +399,8 @@
</span><span class="cx"> void setHasHyphen(bool hasHyphen) { m_bitfields.setHasEllipsisBoxOrHyphen(hasHyphen); }
</span><span class="cx"> bool canHaveLeadingExpansion() const { return m_bitfields.hasSelectedChildrenOrCanHaveLeadingExpansion(); }
</span><span class="cx"> void setCanHaveLeadingExpansion(bool canHaveLeadingExpansion) { m_bitfields.setHasSelectedChildrenOrCanHaveLeadingExpansion(canHaveLeadingExpansion); }
</span><del>- int expansion() { return m_bitfields.expansion(); }
- void setExpansion(int expansion) { m_bitfields.setExpansion(expansion); }
</del><ins>+ float expansion() const { return m_expansion; }
+ void setExpansion(float expansion) { m_expansion = expansion; }
</ins><span class="cx">
</span><span class="cx"> // For InlineFlowBox and InlineTextBox
</span><span class="cx"> bool extracted() const { return m_bitfields.extracted(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual bool isLineBreak() const override final;
</span><span class="cx">
</span><del>- void setExpansion(int newExpansion)
</del><ins>+ void setExpansion(float newExpansion)
</ins><span class="cx"> {
</span><span class="cx"> m_logicalWidth -= expansion();
</span><span class="cx"> InlineBox::setExpansion(newExpansion);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (174232 => 174233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-10-02 21:51:14 UTC (rev 174232)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-10-02 22:25:50 UTC (rev 174233)
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx"> // Only justify text if whitespace is collapsed.
</span><span class="cx"> if (r->renderer().style().collapseWhiteSpace()) {
</span><span class="cx"> InlineTextBox* textBox = toInlineTextBox(r->box());
</span><del>- int expansion = (availableLogicalWidth - totalLogicalWidth) * opportunitiesInRun / expansionOpportunityCount;
</del><ins>+ float expansion = (availableLogicalWidth - totalLogicalWidth) * opportunitiesInRun / expansionOpportunityCount;
</ins><span class="cx"> textBox->setExpansion(expansion);
</span><span class="cx"> totalLogicalWidth += expansion;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>