<!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>[162213] 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/162213">162213</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-17 12:33:04 -0800 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS3] Add rendering support for -webkit-text-align-last
https://bugs.webkit.org/show_bug.cgi?id=99584
Reviewed by David Hyatt.
Source/WebCore:
Add support for the text-align-last CSS3 property, according to the latest specification:
http://dev.w3.org/csswg/css-text-3/#text-align-last-property
Tests: fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html
fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::textAlignmentForLine):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
LayoutTests:
* fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.html: Added.
* fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html: Added.
* fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify-expected.html: Added.
* fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignjustifyexpectedhtml">trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignjustifyhtml">trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignnonjustifyexpectedhtml">trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignnonjustifyhtml">trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162212 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-17 20:29:48 UTC (rev 162212)
+++ trunk/LayoutTests/ChangeLog 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-17 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS3] Add rendering support for -webkit-text-align-last
+ https://bugs.webkit.org/show_bug.cgi?id=99584
+
+ Reviewed by David Hyatt.
+
+ * fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.html: Added.
+ * fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html: Added.
+ * fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify-expected.html: Added.
+ * fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html: Added.
+
</ins><span class="cx"> 2014-01-17 Bear Travis <betravis@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Basic shapes' computed position should be a horizontal and vertical offset
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignjustifyexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.html (0 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify-expected.html 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#tests div {
+ width: 100px;
+ margin-bottom: 20px;
+ border: 1px solid #000000;
+ font: 20px/1 Ahem, sans-serif;
+}
+</style>
+</head>
+<body>
+
+<div id="tests">
+ text-align-last : start
+ <div style='text-align: start;'>X X X XXX</div>
+
+ text-align-last : end
+ <div style='text-align: end;'>X X X XXX</div>
+
+ text-align-last : left
+ <div style='text-align: left;'>X X X XXX</div>
+
+ text-align-last : right
+ <div style='text-align: right;'>X X X XXX</div>
+
+ text-align-last : center
+ <div style='text-align: center;'>X X X XXX</div>
+
+ text-align-last : justify
+ <div style='text-align: justify;'>X X X XX &nbsp;X</div>
+</div>
+
+<p>Since text-align is justify, text-align-last property should be respected,
+thus the alignment of the last line in each box should be as defined by text-align-last.</p>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignjustifyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html (0 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#tests div {
+ width: 100px;
+ margin-bottom: 20px;
+ border: 1px solid #000000;
+ font: 20px/1 Ahem, sans-serif;
+}
+</style>
+</head>
+<body>
+
+<div id="tests">
+ text-align-last : start
+ <div style='text-align: justify; -webkit-text-align-last: start;'>X X X XXX</div>
+
+ text-align-last : end
+ <div style='text-align: justify; -webkit-text-align-last: end;'>X X X XXX</div>
+
+ text-align-last : left
+ <div style='text-align: justify; -webkit-text-align-last: left;'>X X X XXX</div>
+
+ text-align-last : right
+ <div style='text-align: justify; -webkit-text-align-last: right;'>X X X XXX</div>
+
+ text-align-last : center
+ <div style='text-align: justify; -webkit-text-align-last: center;'>X X X XXX</div>
+
+ text-align-last : justify
+ <div style='text-align: justify; -webkit-text-align-last: justify;'>X X X XX X</div>
+</div>
+
+<p>Since text-align is justify, text-align-last property should be respected,
+thus the alignment of the last line in each box should be as defined by text-align-last.</p>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignnonjustifyexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify-expected.html (0 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify-expected.html 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#tests div {
+ width: 100px;
+ margin-bottom: 20px;
+ border: 1px solid #000000;
+ font: 20px/1 Ahem, sans-serif;
+}
+</style>
+</head>
+<body>
+
+<div id="tests">
+ text-align : start; text-align-last : end
+ <div style='text-align: start;'>X X X XXX</div>
+
+ text-align : end; text-align-last : start
+ <div style='text-align: end;'>X X X XXX</div>
+
+ text-align : left; text-align-last : right
+ <div style='text-align: left;'>X X X XXX</div>
+
+ text-align : right; text-align-last : left
+ <div style='text-align: right;'>X X X XXX</div>
+
+ text-align : center; text-align-last : left
+ <div style='text-align: center;'>X X X XXX</div>
+</div>
+
+<p>Since text-align is not justify, text-align-last property shouldn't be respected,
+thus the alignment should be as defined by text-align.</p>
+
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textalignlasttextalignlastwithtextalignnonjustifyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html (0 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#tests div {
+ width: 100px;
+ margin-bottom: 20px;
+ border: 1px solid #000000;
+ font: 20px/1 Ahem, sans-serif;
+}
+</style>
+</head>
+<body>
+
+<div id="tests">
+ text-align : start; text-align-last : end
+ <div style='text-align: start; -webkit-text-align-last: end;'>X X X XXX</div>
+
+ text-align : end; text-align-last : start
+ <div style='text-align: end; -webkit-text-align-last: start;'>X X X XXX</div>
+
+ text-align : left; text-align-last : right
+ <div style='text-align: left; -webkit-text-align-last: right;'>X X X XXX</div>
+
+ text-align : right; text-align-last : left
+ <div style='text-align: right; -webkit-text-align-last: left;'>X X X XXX</div>
+
+ text-align : center; text-align-last : left
+ <div style='text-align: center; -webkit-text-align-last: left;'>X X X XXX</div>
+</div>
+
+<p>Since text-align is not justify, text-align-last property shouldn't be respected,
+thus the alignment should be as defined by text-align.</p>
+
+
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162212 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-17 20:29:48 UTC (rev 162212)
+++ trunk/Source/WebCore/ChangeLog 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-17 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS3] Add rendering support for -webkit-text-align-last
+ https://bugs.webkit.org/show_bug.cgi?id=99584
+
+ Reviewed by David Hyatt.
+
+ Add support for the text-align-last CSS3 property, according to the latest specification:
+ http://dev.w3.org/csswg/css-text-3/#text-align-last-property
+
+ Tests: fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html
+ fast/css3-text/css3-text-align-last/text-align-last-with-text-align-non-justify.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::textAlignmentForLine):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+
</ins><span class="cx"> 2014-01-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build after <http://trac.webkit.org/changeset/162208>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (162212 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-01-17 20:29:48 UTC (rev 162212)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -355,10 +355,36 @@
</span><span class="cx"> ETextAlign RenderBlockFlow::textAlignmentForLine(bool endsWithSoftBreak) const
</span><span class="cx"> {
</span><span class="cx"> ETextAlign alignment = style().textAlign();
</span><del>- if (!endsWithSoftBreak && alignment == JUSTIFY)
- alignment = TASTART;
</del><ins>+ if (endsWithSoftBreak)
+ return alignment;
</ins><span class="cx">
</span><ins>+#if !ENABLE(CSS3_TEXT)
+ return (alignment == JUSTIFY) ? TASTART : alignment;
+#else
+ if (alignment != JUSTIFY)
+ return alignment;
+
+ TextAlignLast alignmentLast = style().textAlignLast();
+ switch (alignmentLast) {
+ case TextAlignLastStart:
+ return TASTART;
+ case TextAlignLastEnd:
+ return TAEND;
+ case TextAlignLastLeft:
+ return LEFT;
+ case TextAlignLastRight:
+ return RIGHT;
+ case TextAlignLastCenter:
+ return CENTER;
+ case TextAlignLastJustify:
+ return JUSTIFY;
+ case TextAlignLastAuto:
+ if (style().textJustify() == TextJustifyDistribute)
+ return JUSTIFY;
+ return TASTART;
+ }
</ins><span class="cx"> return alignment;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void updateLogicalWidthForLeftAlignedBlock(bool isLeftToRightDirection, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float availableLogicalWidth)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (162212 => 162213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-01-17 20:29:48 UTC (rev 162212)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-01-17 20:33:04 UTC (rev 162213)
</span><span class="lines">@@ -502,6 +502,7 @@
</span><span class="cx"> if (rareInheritedData->highlight != other->rareInheritedData->highlight
</span><span class="cx"> || rareInheritedData->indent != other->rareInheritedData->indent
</span><span class="cx"> #if ENABLE(CSS3_TEXT)
</span><ins>+ || rareInheritedData->m_textAlignLast != other->rareInheritedData->m_textAlignLast
</ins><span class="cx"> || rareInheritedData->m_textIndentLine != other->rareInheritedData->m_textIndentLine
</span><span class="cx"> #endif
</span><span class="cx"> || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom
</span></span></pre>
</div>
</div>
</body>
</html>