<!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>[199156] 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/199156">199156</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-04-07 07:55:54 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (197987): Ingredient lists on smittenkitchen.com are full justified instead of left justified.
https://bugs.webkit.org/show_bug.cgi?id=156326
<rdar://problem/25519393>
Reviewed by Antti Koivisto.
According to the spec (https://drafts.csswg.org/css-text-3/#text-align-property)
unless otherwise specified by text-align-last, the last line before
a forced break or the end of the block is start-aligned.
In this patch we check if a forced break is present and we apply text alignment accordingly.
Test: fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html
Source/WebCore:
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::LineState::lastFragment): Make it optional so that we don't just check against a default fragment.
(WebCore::SimpleLineLayout::createLineRuns):
(WebCore::SimpleLineLayout::justifyRuns): Do not compute first run index on the current line twice.
(WebCore::SimpleLineLayout::textAlignForLine):
(WebCore::SimpleLineLayout::closeLineEndingAndAdjustRuns):
LayoutTests:
* fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout-expected.html: Added.
* fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.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="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcss3textcss3textjustifytextjustifylastlinesimplelinelayoutexpectedhtml">trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textjustifytextjustifylastlinesimplelinelayouthtml">trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199155 => 199156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-07 14:22:11 UTC (rev 199155)
+++ trunk/LayoutTests/ChangeLog 2016-04-07 14:55:54 UTC (rev 199156)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-04-07 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (197987): Ingredient lists on smittenkitchen.com are full justified instead of left justified.
+ https://bugs.webkit.org/show_bug.cgi?id=156326
+ <rdar://problem/25519393>
+
+ Reviewed by Antti Koivisto.
+
+ According to the spec (https://drafts.csswg.org/css-text-3/#text-align-property)
+ unless otherwise specified by text-align-last, the last line before
+ a forced break or the end of the block is start-aligned.
+
+ In this patch we check if a forced break is present and we apply text alignment accordingly.
+
+ Test: fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html
+
+ * fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout-expected.html: Added.
+ * fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html: Added.
+
</ins><span class="cx"> 2016-04-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Shadow DOM: Implement display: contents for slots
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textjustifytextjustifylastlinesimplelinelayoutexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout-expected.html (0 => 199156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout-expected.html 2016-04-07 14:55:54 UTC (rev 199156)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that ignore text-align: justify for last lines.</title>
+<style>
+div {
+ display: inline-block;
+ border: 1px solid green;
+ text-align: justify;
+ margin-left: 10px;
+}
+</style>
+</head>
+<body>
+<script>
+if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+var width = 50;
+var content = "Lo rem ip<br>sum do lor<br>sit a met, con sec te tur<br>ad ip is cing el it<br>sed do e i us mod tempor.";
+for (var i = 0; i < 20; ++i, width += 5) {
+ var element = document.createElement("div");
+ element.style.width = width + "px";
+ element.innerHTML = content;
+ document.body.appendChild(element);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textjustifytextjustifylastlinesimplelinelayouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html (0 => 199156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html 2016-04-07 14:55:54 UTC (rev 199156)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that ignore text-align: justify for last lines.</title>
+<style>
+div {
+ display: inline-block;
+ border: 1px solid green;
+ text-align: justify;
+ margin-left: 10px;
+}
+</style>
+</head>
+<body>
+<script>
+var width = 50;
+var content = "Lo rem ip<br>sum do lor<br>sit a met, con sec te tur<br>ad ip is cing el it<br>sed do e i us mod tempor.";
+for (var i = 0; i < 20; ++i, width += 5) {
+ var element = document.createElement("div");
+ element.style.width = width + "px";
+ element.innerHTML = content;
+ document.body.appendChild(element);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199155 => 199156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-07 14:22:11 UTC (rev 199155)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 14:55:54 UTC (rev 199156)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-04-07 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (197987): Ingredient lists on smittenkitchen.com are full justified instead of left justified.
+ https://bugs.webkit.org/show_bug.cgi?id=156326
+ <rdar://problem/25519393>
+
+ Reviewed by Antti Koivisto.
+
+ According to the spec (https://drafts.csswg.org/css-text-3/#text-align-property)
+ unless otherwise specified by text-align-last, the last line before
+ a forced break or the end of the block is start-aligned.
+
+ In this patch we check if a forced break is present and we apply text alignment accordingly.
+
+ Test: fast/css3-text/css3-text-justify/text-justify-last-line-simple-line-layout.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::LineState::lastFragment): Make it optional so that we don't just check against a default fragment.
+ (WebCore::SimpleLineLayout::createLineRuns):
+ (WebCore::SimpleLineLayout::justifyRuns): Do not compute first run index on the current line twice.
+ (WebCore::SimpleLineLayout::textAlignForLine):
+ (WebCore::SimpleLineLayout::closeLineEndingAndAdjustRuns):
+
</ins><span class="cx"> 2016-04-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> FrameView::qualifiesAsVisuallyNonEmpty() returns false when loading a Google search results page before search results are loaded, even though the header is visible
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (199155 => 199156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-04-07 14:22:11 UTC (rev 199155)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-04-07 14:55:54 UTC (rev 199156)
</span><span class="lines">@@ -402,7 +402,12 @@
</span><span class="cx"> float logicalLeftOffset() const { return m_logicalLeftOffset; }
</span><span class="cx"> const TextFragmentIterator::TextFragment& overflowedFragment() const { return m_overflowedFragment; }
</span><span class="cx"> bool hasTrailingWhitespace() const { return m_trailingWhitespaceLength; }
</span><del>- TextFragmentIterator::TextFragment lastFragment() const { return m_fragments.last(); }
</del><ins>+ Optional<TextFragmentIterator::TextFragment> lastFragment() const
+ {
+ if (m_fragments.size())
+ return m_fragments.last();
+ return Nullopt;
+ }
</ins><span class="cx"> bool isWhitespaceOnly() const { return m_trailingWhitespaceWidth && m_runsWidth == m_trailingWhitespaceWidth; }
</span><span class="cx"> bool fits(float extra) const { return m_availableWidth >= m_runsWidth + extra; }
</span><span class="cx"> bool firstCharacterFits() const { return m_firstCharacterFits; }
</span><span class="lines">@@ -733,7 +738,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> // Non-breakable non-whitespace fragment when there's already content on the line. Push it to the next line.
</span><del>- if (line.lastFragment().overlapsToNextRenderer()) {
</del><ins>+ ASSERT(line.lastFragment());
+ if (line.lastFragment().value().overlapsToNextRenderer()) {
</ins><span class="cx"> // Check if this fragment is a continuation of a previous segment. In such cases, we need to remove them all.
</span><span class="cx"> const auto& lastCompleteFragment = line.revertToLastCompleteFragment(runs);
</span><span class="cx"> textFragmentIterator.revertToEndOfFragment(lastCompleteFragment);
</span><span class="lines">@@ -757,14 +763,13 @@
</span><span class="cx"> return expansionBehavior;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void justifyRuns(const LineState& line, Layout::RunVector& runs, Optional<unsigned> lastRunIndexOfPreviousLine)
</del><ins>+static void justifyRuns(const LineState& line, Layout::RunVector& runs, unsigned firstRunIndex)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(runs.size());
</span><span class="cx"> auto widthToDistribute = line.availableWidth() - line.width();
</span><span class="cx"> if (widthToDistribute <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto firstRunIndex = lastRunIndexOfPreviousLine ? lastRunIndexOfPreviousLine.value() + 1 : 0;
</del><span class="cx"> auto lastRunIndex = runs.size() - 1;
</span><span class="cx"> ASSERT(firstRunIndex <= lastRunIndex);
</span><span class="cx"> Vector<std::pair<unsigned, ExpansionBehavior>> expansionOpportunityList;
</span><span class="lines">@@ -794,8 +799,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static ETextAlign textAlignForLine(const TextFragmentIterator::Style& style, bool lastLine)
+{
+ // Fallback to LEFT (START) alignment for non-collapsable content and for the last line before a forced break or the end of the block.
+ auto textAlign = style.textAlign;
+ if (textAlign == JUSTIFY && (!style.collapseWhitespace || lastLine))
+ textAlign = LEFT;
+ return textAlign;
+}
+
</ins><span class="cx"> static void closeLineEndingAndAdjustRuns(LineState& line, Layout::RunVector& runs, Optional<unsigned> lastRunIndexOfPreviousLine, unsigned& lineCount,
</span><del>- const TextFragmentIterator& textFragmentIterator, bool lastLine)
</del><ins>+ const TextFragmentIterator& textFragmentIterator, bool lastLineInFlow)
</ins><span class="cx"> {
</span><span class="cx"> if (!runs.size() || (lastRunIndexOfPreviousLine && runs.size() - 1 == lastRunIndexOfPreviousLine.value()))
</span><span class="cx"> return;
</span><span class="lines">@@ -804,17 +818,13 @@
</span><span class="cx"> return;
</span><span class="cx"> // Adjust runs' position by taking line's alignment into account.
</span><span class="cx"> const auto& style = textFragmentIterator.style();
</span><del>- auto textAlign = style.textAlign;
- // Fallback to LEFT alignment both for non-collapsable content and for the last line.
- if (textAlign == JUSTIFY && (!style.collapseWhitespace || lastLine))
- textAlign = LEFT;
-
</del><ins>+ auto firstRunIndex = lastRunIndexOfPreviousLine ? lastRunIndexOfPreviousLine.value() + 1 : 0;
</ins><span class="cx"> auto lineLogicalLeft = line.logicalLeftOffset();
</span><ins>+ auto textAlign = textAlignForLine(style, lastLineInFlow || (line.lastFragment() && line.lastFragment().value().type() == TextFragmentIterator::TextFragment::HardLineBreak));
</ins><span class="cx"> if (textAlign == JUSTIFY)
</span><del>- justifyRuns(line, runs, lastRunIndexOfPreviousLine);
</del><ins>+ justifyRuns(line, runs, firstRunIndex);
</ins><span class="cx"> else
</span><span class="cx"> lineLogicalLeft = computeLineLeft(textAlign, line.availableWidth(), line.width(), line.logicalLeftOffset());
</span><del>- auto firstRunIndex = lastRunIndexOfPreviousLine ? lastRunIndexOfPreviousLine.value() + 1 : 0;
</del><span class="cx"> for (auto i = firstRunIndex; i < runs.size(); ++i) {
</span><span class="cx"> runs[i].logicalLeft += lineLogicalLeft;
</span><span class="cx"> runs[i].logicalRight += lineLogicalLeft;
</span></span></pre>
</div>
</div>
</body>
</html>