<!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>[187380] 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/187380">187380</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-07-24 20:51:06 -0700 (Fri, 24 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>text-overflow: ellipsis is broken by text-align: right and padding-left
https://bugs.webkit.org/show_bug.cgi?id=121902
Reviewed by Zalan Bujtas.
Source/WebCore:
Right offsets (which include padding) are not the same as widths (which don't).
Test: fast/inline/padding-ellipsis-right.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::updateLogicalWidthForRightAlignedBlock):
(WebCore::RenderBlockFlow::checkLinesForTextOverflow):
LayoutTests:
Updating expected results.
* fast/inline/padding-ellipsis-right-expected.html: Added.
* fast/inline/padding-ellipsis-right.html: Added.
* platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.png:
* platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.txt:
* platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.png:
* platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt:
* platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.png:
* platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.txt:
* platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png:
* platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt:
* platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-left-expected.png:
* platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png:
* platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextaligncenterexpectedpng">trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextaligncenterexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignleftexpectedpng">trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignleftexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignrightexpectedpng">trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignrightexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextaligncenterexpectedpng">trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextaligncenterexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextalignleftexpectedpng">trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-left-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextalignrightexpectedpng">trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextalignrightexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinepaddingellipsisrightexpectedhtml">trunk/LayoutTests/fast/inline/padding-ellipsis-right-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastinlinepaddingellipsisrighthtml">trunk/LayoutTests/fast/inline/padding-ellipsis-right.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/LayoutTests/ChangeLog 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ text-overflow: ellipsis is broken by text-align: right and padding-left
+ https://bugs.webkit.org/show_bug.cgi?id=121902
+
+ Reviewed by Zalan Bujtas.
+
+ Updating expected results.
+
+ * fast/inline/padding-ellipsis-right-expected.html: Added.
+ * fast/inline/padding-ellipsis-right.html: Added.
+ * platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.png:
+ * platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.txt:
+ * platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.png:
+ * platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt:
+ * platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.png:
+ * platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.txt:
+ * platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png:
+ * platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt:
+ * platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-left-expected.png:
+ * platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png:
+ * platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt:
+
</ins><span class="cx"> 2015-07-24 Sajid Anwar <sajidanwar94@gmail.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Incorrect sample timestamps when using "sequence" mode
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlinepaddingellipsisrightexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/padding-ellipsis-right-expected.html (0 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/padding-ellipsis-right-expected.html (rev 0)
+++ trunk/LayoutTests/fast/inline/padding-ellipsis-right-expected.html 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that text-align: right, text-overflow: ellipsis, and padding all play nicely with each other.
+<div style="font-size: 0px;">
+<div style="width: 140px; height: 20px; background-color: green;"></div><div style="display: inline-block; width: 20px; height: 20px; background-color: green;"></div><div style="display: inline-block; width: 100px; height: 20px; background-color: black;"></div><div style="display: inline-block; width: 20px; height: 20px; background-color: green;"></div><div style="width: 140px; height: 20px; background-color: green;"></div>
+</div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlinepaddingellipsisrighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/padding-ellipsis-right.html (0 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/padding-ellipsis-right.html (rev 0)
+++ trunk/LayoutTests/fast/inline/padding-ellipsis-right.html 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that text-align: right, text-overflow: ellipsis, and padding all play nicely with each other.
+<div style="font: 20px Ahem; -webkit-font-smoothing: none;">
+<div style="padding: 20px; width: 100px; background-color: green; overflow: hidden; text-overflow: ellipsis; text-align: right;">abcdefghijklmnopqrstuvwxyz</div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextaligncenterexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextaligncenterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.txt (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.txt 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-center-expected.txt 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -35,29 +35,29 @@
</span><span class="cx"> text run at (0,0) width 506: "Right-To-Left containing replaced content blocking the ellipsis"
</span><span class="cx"> layer at (8,119) size 310x20 clip at (9,120) size 308x18 scrollWidth 738
</span><span class="cx"> RenderBlock {DIV} at (0,111) size 310x21 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (2,1) size 738x18
- text run at (2,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,1) size 738x18
+ text run at (1,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,200) size 310x74 clip at (9,201) size 308x72 scrollWidth 738
</span><span class="cx"> RenderBlock {DIV} at (0,192) size 310x75 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (2,1) size 738x18
- text run at (2,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,1) size 738x18
+ text run at (1,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (1,19) size 728x18
</span><span class="cx"> text run at (1,19) width 728: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (2,37) size 720x18
- text run at (2,37) width 720: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,37) size 720x18
+ text run at (1,37) width 720: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (2,55) size 715x18
- text run at (2,55) width 715: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (2,55) size 714x18
+ text run at (2,55) width 714: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> layer at (8,335) size 310x31 clip at (9,336) size 308x29 scrollWidth 766
</span><span class="cx"> RenderBlock {DIV} at (0,326) size 310x32 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (1,12) size 187x18
- text run at (1,12) width 187: "Lorem ipsum dolor sit amet, "
- RenderImage {IMG} at (187,1) size 26x25
- RenderText {#text} at (212,12) size 556x18
- text run at (212,12) width 556: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,12) size 186x18
+ text run at (1,12) width 186: "Lorem ipsum dolor sit amet, "
+ RenderImage {IMG} at (186,1) size 26x25
+ RenderText {#text} at (211,12) size 556x18
+ text run at (211,12) width 556: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,427) size 310x31 clip at (9,428) size 308x29 scrollWidth 762
</span><span class="cx"> RenderBlock {DIV} at (0,418) size 310x32 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (1,12) size 278x18
</span><span class="lines">@@ -65,31 +65,31 @@
</span><span class="cx"> RenderImage {IMG} at (278,1) size 26x25
</span><span class="cx"> RenderText {#text} at (303,12) size 460x18
</span><span class="cx"> text run at (303,12) width 460: "ipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><del>-layer at (8,518) size 310x20 clip at (9,519) size 308x18 scrollX 430 scrollWidth 738
</del><ins>+layer at (8,518) size 310x20 clip at (9,519) size 308x18 scrollX 429 scrollWidth 738
</ins><span class="cx"> RenderBlock {DIV} at (0,510) size 310x21 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (-429,1) size 738x18
- text run at (-429,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
-layer at (8,599) size 310x74 clip at (9,600) size 308x72 scrollX 430 scrollWidth 738
</del><ins>+ RenderText {#text} at (-428,1) size 738x18
+ text run at (-428,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
+layer at (8,599) size 310x74 clip at (9,600) size 308x72 scrollX 429 scrollWidth 738
</ins><span class="cx"> RenderBlock {DIV} at (0,591) size 310x75 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (-429,1) size 738x18
- text run at (-429,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-428,1) size 738x18
+ text run at (-428,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (-418,19) size 728x18
</span><span class="cx"> text run at (-418,19) width 727 RTL override: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (-411,37) size 720x18
- text run at (-411,37) width 719 RTL override: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-410,37) size 720x18
+ text run at (-410,37) width 719 RTL override: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (-406,55) size 715x18
- text run at (-406,55) width 714 RTL override: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-405,55) size 714x18
+ text run at (-405,55) width 713 RTL override: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>-layer at (8,734) size 310x31 clip at (9,735) size 308x29 scrollX 458 scrollWidth 766
</del><ins>+layer at (8,734) size 310x31 clip at (9,735) size 308x29 scrollX 457 scrollWidth 766
</ins><span class="cx"> RenderBlock {DIV} at (0,725) size 310x32 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (122,12) size 187x18
- text run at (122,12) width 187 RTL override: "Lorem ipsum dolor sit amet, "
- RenderImage {IMG} at (97,1) size 26x25
- RenderText {#text} at (-457,12) size 556x18
- text run at (-457,12) width 555 RTL override: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (123,12) size 186x18
+ text run at (123,12) width 186 RTL override: "Lorem ipsum dolor sit amet, "
+ RenderImage {IMG} at (98,1) size 26x25
+ RenderText {#text} at (-456,12) size 556x18
+ text run at (-456,12) width 555 RTL override: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,825) size 310x31 clip at (9,826) size 308x29 scrollX 453 scrollWidth 762
</span><span class="cx"> RenderBlock {DIV} at (0,817) size 310x32 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (31,12) size 278x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignleftexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignleftexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-left-expected.txt 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -65,31 +65,31 @@
</span><span class="cx"> RenderImage {IMG} at (278,1) size 26x25
</span><span class="cx"> RenderText {#text} at (303,12) size 460x18
</span><span class="cx"> text run at (303,12) width 460: "ipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><del>-layer at (8,518) size 310x20 clip at (9,519) size 308x18 scrollX 431 scrollWidth 740
</del><ins>+layer at (8,518) size 310x20 clip at (9,519) size 308x18 scrollX 430 scrollWidth 739
</ins><span class="cx"> RenderBlock {DIV} at (0,510) size 310x21 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (-430,1) size 738x18
- text run at (-430,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
-layer at (8,599) size 310x74 clip at (9,600) size 308x72 scrollX 431 scrollWidth 740
</del><ins>+ RenderText {#text} at (-429,1) size 738x18
+ text run at (-429,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
+layer at (8,599) size 310x74 clip at (9,600) size 308x72 scrollX 430 scrollWidth 739
</ins><span class="cx"> RenderBlock {DIV} at (0,591) size 310x75 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (-430,1) size 738x18
- text run at (-430,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-429,1) size 738x18
+ text run at (-429,1) width 737 RTL override: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (-419,19) size 728x18
- text run at (-419,19) width 727 RTL override: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-418,19) size 728x18
+ text run at (-418,19) width 727 RTL override: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (-412,37) size 720x18
- text run at (-412,37) width 719 RTL override: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-411,37) size 720x18
+ text run at (-411,37) width 719 RTL override: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (-408,55) size 715x18
- text run at (-408,55) width 714 RTL override: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (-407,55) size 715x18
+ text run at (-407,55) width 714 RTL override: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>-layer at (8,734) size 310x31 clip at (9,735) size 308x29 scrollX 459 scrollWidth 767
</del><ins>+layer at (8,734) size 310x31 clip at (9,735) size 308x29 scrollX 458 scrollWidth 766
</ins><span class="cx"> RenderBlock {DIV} at (0,725) size 310x32 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (121,12) size 187x18
- text run at (121,12) width 187 RTL override: "Lorem ipsum dolor sit amet, "
- RenderImage {IMG} at (96,1) size 26x25
- RenderText {#text} at (-458,12) size 556x18
- text run at (-458,12) width 555 RTL override: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (122,12) size 187x18
+ text run at (122,12) width 187 RTL override: "Lorem ipsum dolor sit amet, "
+ RenderImage {IMG} at (97,1) size 26x25
+ RenderText {#text} at (-457,12) size 556x18
+ text run at (-457,12) width 555 RTL override: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,825) size 310x31 clip at (9,826) size 308x29 scrollX 453 scrollWidth 762
</span><span class="cx"> RenderBlock {DIV} at (0,817) size 310x32 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (31,12) size 278x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignrightexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowellipsistextalignrightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.txt (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.txt 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/LayoutTests/platform/mac/fast/css/text-overflow-ellipsis-text-align-right-expected.txt 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -33,31 +33,31 @@
</span><span class="cx"> RenderBlock {H3} at (0,776) size 769x23
</span><span class="cx"> RenderText {#text} at (0,0) size 506x22
</span><span class="cx"> text run at (0,0) width 506: "Right-To-Left containing replaced content blocking the ellipsis"
</span><del>-layer at (8,119) size 310x20 clip at (9,120) size 308x18 scrollWidth 740
</del><ins>+layer at (8,119) size 310x20 clip at (9,120) size 308x18 scrollWidth 739
</ins><span class="cx"> RenderBlock {DIV} at (0,111) size 310x21 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (3,1) size 738x18
- text run at (3,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
-layer at (8,200) size 310x74 clip at (9,201) size 308x72 scrollWidth 740
</del><ins>+ RenderText {#text} at (2,1) size 738x18
+ text run at (2,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
+layer at (8,200) size 310x74 clip at (9,201) size 308x72 scrollWidth 739
</ins><span class="cx"> RenderBlock {DIV} at (0,192) size 310x75 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (3,1) size 738x18
- text run at (3,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (2,1) size 738x18
+ text run at (2,1) width 738: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (2,19) size 728x18
- text run at (2,19) width 728: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,19) size 728x18
+ text run at (1,19) width 728: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (3,37) size 720x18
- text run at (3,37) width 720: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (2,37) size 720x18
+ text run at (2,37) width 720: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (4,55) size 715x18
- text run at (4,55) width 715: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (3,55) size 715x18
+ text run at (3,55) width 715: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>-layer at (8,335) size 310x31 clip at (9,336) size 308x29 scrollWidth 767
</del><ins>+layer at (8,335) size 310x31 clip at (9,336) size 308x29 scrollWidth 766
</ins><span class="cx"> RenderBlock {DIV} at (0,326) size 310x32 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (2,12) size 187x18
- text run at (2,12) width 187: "Lorem ipsum dolor sit amet, "
- RenderImage {IMG} at (188,1) size 26x25
- RenderText {#text} at (213,12) size 556x18
- text run at (213,12) width 556: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,12) size 187x18
+ text run at (1,12) width 187: "Lorem ipsum dolor sit amet, "
+ RenderImage {IMG} at (187,1) size 26x25
+ RenderText {#text} at (212,12) size 556x18
+ text run at (212,12) width 556: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,427) size 310x31 clip at (9,428) size 308x29 scrollWidth 762
</span><span class="cx"> RenderBlock {DIV} at (0,418) size 310x32 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (1,12) size 278x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextaligncenterexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextaligncenterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -29,36 +29,36 @@
</span><span class="cx"> text run at (0,0) width 506: "Right-To-Left containing replaced content blocking the ellipsis"
</span><span class="cx"> layer at (8,49) size 20x310 clip at (9,50) size 18x308 scrollHeight 737
</span><span class="cx"> RenderBlock {DIV} at (0,40) size 20x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (1,1) size 18x738
</del><ins>+ RenderText {#text} at (1,1) size 18x737
</ins><span class="cx"> text run at (1,1) width 737: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> layer at (8,419) size 74x310 clip at (9,420) size 72x308 scrollHeight 737
</span><span class="cx"> RenderBlock {DIV} at (0,411) size 74x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (1,1) size 18x738
</del><ins>+ RenderText {#text} at (1,1) size 18x737
</ins><span class="cx"> text run at (1,1) width 737: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (19,1) size 18x728
</del><ins>+ RenderText {#text} at (19,1) size 18x727
</ins><span class="cx"> text run at (19,1) width 727: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (37,1) size 18x720
</del><ins>+ RenderText {#text} at (37,1) size 18x719
</ins><span class="cx"> text run at (37,1) width 719: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (55,1) size 18x715
</del><ins>+ RenderText {#text} at (55,1) size 18x714
</ins><span class="cx"> text run at (55,1) width 714: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> layer at (8,790) size 31x310 clip at (9,791) size 29x308 scrollHeight 766
</span><span class="cx"> RenderBlock {DIV} at (0,782) size 31x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (12,1) size 18x187
</del><ins>+ RenderText {#text} at (12,1) size 18x186
</ins><span class="cx"> text run at (12,1) width 186: "Lorem ipsum dolor sit amet, "
</span><del>- RenderImage {IMG} at (1,187) size 25x26
- RenderText {#text} at (12,212) size 18x556
- text run at (12,212) width 555: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderImage {IMG} at (1,186) size 25x26
+ RenderText {#text} at (12,211) size 18x556
+ text run at (12,211) width 555: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,1161) size 31x310 clip at (9,1162) size 29x308 scrollHeight 762
</span><span class="cx"> RenderBlock {DIV} at (0,1152) size 31x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (12,1) size 18x279
</del><ins>+ RenderText {#text} at (12,1) size 18x278
</ins><span class="cx"> text run at (12,1) width 278: "Lorem ipsum dolor sit amet, consectetur ad"
</span><del>- RenderImage {IMG} at (1,279) size 25x26
- RenderText {#text} at (12,304) size 18x460
- text run at (12,304) width 459: "ipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderImage {IMG} at (1,278) size 25x26
+ RenderText {#text} at (12,303) size 18x460
+ text run at (12,303) width 459: "ipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,1532) size 20x310 clip at (9,1533) size 18x308 scrollY 428 scrollHeight 737
</span><span class="cx"> RenderBlock {DIV} at (0,1523) size 20x311 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (1,-427) size 18x737
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextalignleftexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-left-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextalignrightexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssverticaltextoverflowellipsistextalignrightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/LayoutTests/platform/mac/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -27,38 +27,38 @@
</span><span class="cx"> RenderBlock {H3} at (0,2595) size 769x23
</span><span class="cx"> RenderText {#text} at (0,0) size 506x22
</span><span class="cx"> text run at (0,0) width 506: "Right-To-Left containing replaced content blocking the ellipsis"
</span><del>-layer at (8,49) size 20x310 clip at (9,50) size 18x308 scrollHeight 738
</del><ins>+layer at (8,49) size 20x310 clip at (9,50) size 18x308 scrollHeight 737
</ins><span class="cx"> RenderBlock {DIV} at (0,40) size 20x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (1,2) size 18x737
- text run at (1,2) width 737: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
-layer at (8,419) size 74x310 clip at (9,420) size 72x308 scrollHeight 738
</del><ins>+ RenderText {#text} at (1,1) size 18x737
+ text run at (1,1) width 737: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
+layer at (8,419) size 74x310 clip at (9,420) size 72x308 scrollHeight 737
</ins><span class="cx"> RenderBlock {DIV} at (0,411) size 74x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (1,2) size 18x737
- text run at (1,2) width 737: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (1,1) size 18x737
+ text run at (1,1) width 737: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (19,2) size 18x727
- text run at (19,2) width 727: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (19,1) size 18x727
+ text run at (19,1) width 727: "orem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (37,2) size 18x719
- text run at (37,2) width 719: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (37,1) size 18x719
+ text run at (37,1) width 719: "rem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- RenderText {#text} at (55,2) size 18x714
- text run at (55,2) width 714: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (55,1) size 18x714
+ text run at (55,1) width 714: "em ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>-layer at (8,790) size 31x310 clip at (9,791) size 29x308 scrollHeight 767
</del><ins>+layer at (8,790) size 31x310 clip at (9,791) size 29x308 scrollHeight 766
</ins><span class="cx"> RenderBlock {DIV} at (0,782) size 31x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (12,2) size 18x186
- text run at (12,2) width 186: "Lorem ipsum dolor sit amet, "
- RenderImage {IMG} at (1,187) size 25x26
- RenderText {#text} at (12,212) size 18x556
- text run at (12,212) width 555: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
-layer at (8,1161) size 31x310 clip at (9,1162) size 29x308 scrollHeight 763
</del><ins>+ RenderText {#text} at (12,1) size 18x186
+ text run at (12,1) width 186: "Lorem ipsum dolor sit amet, "
+ RenderImage {IMG} at (1,186) size 25x26
+ RenderText {#text} at (12,211) size 18x556
+ text run at (12,211) width 555: " consectetur adipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
+layer at (8,1161) size 31x310 clip at (9,1162) size 29x308 scrollHeight 762
</ins><span class="cx"> RenderBlock {DIV} at (0,1152) size 31x311 [border: (1px solid #000000)]
</span><del>- RenderText {#text} at (12,2) size 18x278
- text run at (12,2) width 278: "Lorem ipsum dolor sit amet, consectetur ad"
- RenderImage {IMG} at (1,279) size 25x26
- RenderText {#text} at (12,304) size 18x460
- text run at (12,304) width 459: "ipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</del><ins>+ RenderText {#text} at (12,1) size 18x278
+ text run at (12,1) width 278: "Lorem ipsum dolor sit amet, consectetur ad"
+ RenderImage {IMG} at (1,278) size 25x26
+ RenderText {#text} at (12,303) size 18x460
+ text run at (12,303) width 459: "ipiscing elit. Vivamus vitae eros non libero faucibus sagittis sed ut eros."
</ins><span class="cx"> layer at (8,1532) size 20x310 clip at (9,1533) size 18x308 scrollY 428 scrollHeight 737
</span><span class="cx"> RenderBlock {DIV} at (0,1523) size 20x311 [border: (1px solid #000000)]
</span><span class="cx"> RenderText {#text} at (1,-427) size 18x737
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/Source/WebCore/ChangeLog 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-07-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ text-overflow: ellipsis is broken by text-align: right and padding-left
+ https://bugs.webkit.org/show_bug.cgi?id=121902
+
+ Reviewed by Zalan Bujtas.
+
+ Right offsets (which include padding) are not the same as widths (which don't).
+
+ Test: fast/inline/padding-ellipsis-right.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::updateLogicalWidthForRightAlignedBlock):
+ (WebCore::RenderBlockFlow::checkLinesForTextOverflow):
+
</ins><span class="cx"> 2015-07-24 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Tried to fix the iOS 9 build after r187375.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (187379 => 187380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-07-25 03:41:08 UTC (rev 187379)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-07-25 03:51:06 UTC (rev 187380)
</span><span class="lines">@@ -416,8 +416,7 @@
</span><span class="cx"> totalLogicalWidth -= trailingSpaceRun->box()->logicalWidth();
</span><span class="cx"> trailingSpaceRun->box()->setLogicalWidth(0);
</span><span class="cx"> }
</span><del>- if (totalLogicalWidth < availableLogicalWidth)
- logicalLeft += availableLogicalWidth - totalLogicalWidth;
</del><ins>+ logicalLeft += std::max(0.f, availableLogicalWidth - totalLogicalWidth);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1991,7 +1990,7 @@
</span><span class="cx"> // Determine the width of the ellipsis using the current font.
</span><span class="cx"> // FIXME: CSS3 says this is configurable, also need to use 0x002E (FULL STOP) if horizontal ellipsis is "not renderable"
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1));
</del><ins>+ static NeverDestroyed<AtomicString> ellipsisStr(&horizontalEllipsis, 1);
</ins><span class="cx"> const FontCascade& firstLineFont = firstLineStyle().fontCascade();
</span><span class="cx"> float firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &horizontalEllipsis, 1, firstLineStyle()));
</span><span class="cx"> float ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : font.width(constructTextRun(this, font, &horizontalEllipsis, 1, style()));
</span><span class="lines">@@ -2019,8 +2018,8 @@
</span><span class="cx"> float totalLogicalWidth = curr->placeEllipsis(ellipsisStr, ltr, blockLeftEdge, blockRightEdge, width);
</span><span class="cx">
</span><span class="cx"> float logicalLeft = 0; // We are only interested in the delta from the base position.
</span><del>- float truncatedWidth = logicalRightOffsetForLine(curr->lineTop(), firstLine);
- updateLogicalWidthForAlignment(textAlign, curr, 0, logicalLeft, totalLogicalWidth, truncatedWidth, 0);
</del><ins>+ float truncatedWidth = availableLogicalWidthForLine(curr->lineTop(), firstLine);
+ updateLogicalWidthForAlignment(textAlign, curr, nullptr, logicalLeft, totalLogicalWidth, truncatedWidth, 0);
</ins><span class="cx"> if (ltr)
</span><span class="cx"> curr->adjustLogicalPosition(logicalLeft, 0);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>