<!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>[213944] 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/213944">213944</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 14:58:39 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Adjust hyphenation constrains based on the normal line layout line-breaking logic.
https://bugs.webkit.org/show_bug.cgi?id=169617
Source/WebCore:
Reviewed by Antti Koivisto.
This patch ensures that simple line layout ends up with the same hyphenation context as normal line layout.
Test: fast/text/simple-line-layout-hyphenation-constrains.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::hyphenPositionForFragment): see webkit.org/b/169613
(WebCore::SimpleLineLayout::splitFragmentToFitLine):
* rendering/line/BreakingContext.h: Integral -> fractional.
(WebCore::tryHyphenating):
LayoutTests:
Reviewed by Antti Koivisto.
* fast/text/simple-line-layout-hyphenation-constrains-expected.html: Added.
* fast/text/simple-line-layout-hyphenation-constrains.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>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContexth">trunk/Source/WebCore/rendering/line/BreakingContext.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayouthyphenationconstrainsexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayouthyphenationconstrainshtml">trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213943 => 213944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-14 21:48:15 UTC (rev 213943)
+++ trunk/LayoutTests/ChangeLog 2017-03-14 21:58:39 UTC (rev 213944)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-14 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Adjust hyphenation constrains based on the normal line layout line-breaking logic.
+ https://bugs.webkit.org/show_bug.cgi?id=169617
+
+ Reviewed by Antti Koivisto.
+
+ * fast/text/simple-line-layout-hyphenation-constrains-expected.html: Added.
+ * fast/text/simple-line-layout-hyphenation-constrains.html: Added.
+
</ins><span class="cx"> 2017-03-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark imported/w3c/web-platform-tests/cors/status.htm as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayouthyphenationconstrainsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains-expected.html (0 => 213944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains-expected.html 2017-03-14 21:58:39 UTC (rev 213944)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple and normal line layout produce the same lines with hyphenation and enlarged font</title>
+<style>
+div {
+ display: inline-block;
+ width: 43px;
+ margin-right: 150px;
+ vertical-align: top;
+ font-size: 30px;
+}
+</style>
+</head>
+<body>
+<div>advantageous remunerative profitability</div>
+<div>saxicolous sesquipedalian superabundant</div>
+<div>unencumbered responsibilities unparagoned peerless</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayouthyphenationconstrainshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains.html (0 => 213944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-hyphenation-constrains.html 2017-03-14 21:58:39 UTC (rev 213944)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple and normal line layout produce the same lines with hyphenation and enlarged font</title>
+<style>
+div {
+ display: inline-block;
+ -webkit-hyphens: auto;
+ width: 43px;
+ margin-right: 150px;
+ vertical-align: top;
+ font-size: 30px;
+}
+</style>
+</head>
+<body>
+<div>advantageous remunerative profitability</div>
+<div>saxicolous sesquipedalian superabundant</div>
+<div>unencumbered responsibilities unparagoned peerless</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213943 => 213944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 21:48:15 UTC (rev 213943)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 21:58:39 UTC (rev 213944)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-14 Alan Kinsley <zalan@apple.com>
+
+ Simple line layout: Adjust hyphenation constrains based on the normal line layout line-breaking logic.
+ https://bugs.webkit.org/show_bug.cgi?id=169617
+
+ Reviewed by Antti Koivisto.
+
+ This patch ensures that simple line layout ends up with the same hyphenation context as normal line layout.
+
+ Test: fast/text/simple-line-layout-hyphenation-constrains.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::hyphenPositionForFragment): see webkit.org/b/169613
+ (WebCore::SimpleLineLayout::splitFragmentToFitLine):
+ * rendering/line/BreakingContext.h: Integral -> fractional.
+ (WebCore::tryHyphenating):
+
</ins><span class="cx"> 2017-03-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor: Allow WebKit2 to override the creation of RealtimeMediaSources
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (213943 => 213944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-03-14 21:48:15 UTC (rev 213943)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-03-14 21:58:39 UTC (rev 213944)
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static std::optional<unsigned> hyphenPositionForFragment(unsigned splitPosition, TextFragmentIterator::TextFragment& fragmentToSplit,
</span><del>- const TextFragmentIterator& textFragmentIterator, float availableWidth)
</del><ins>+ const TextFragmentIterator& textFragmentIterator, float availableWidth, bool lineIsEmpty)
</ins><span class="cx"> {
</span><span class="cx"> auto& style = textFragmentIterator.style();
</span><span class="cx"> bool shouldHyphenate = style.shouldHyphenate && (!style.hyphenLimitLines || fragmentToSplit.wrappingWithHyphenCounter() < *style.hyphenLimitLines);
</span><span class="lines">@@ -619,7 +619,12 @@
</span><span class="cx"> if (!shouldHyphenate)
</span><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><del>- if (!enoughWidthForHyphenation(availableWidth, style.font.pixelSize()))
</del><ins>+ // FIXME: This is a workaround for webkit.org/b/169613. See maxPrefixWidth computation in tryHyphenating().
+ // It does not work properly with non-collapsed leading tabs when font is enlarged.
+ auto adjustedAvailableWidth = availableWidth - style.hyphenStringWidth;
+ if (!lineIsEmpty)
+ adjustedAvailableWidth += style.spaceWidth;
+ if (!enoughWidthForHyphenation(adjustedAvailableWidth, style.font.pixelSize()))
</ins><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><span class="cx"> // We might be able to fit the hyphen at the split position.
</span><span class="lines">@@ -636,7 +641,7 @@
</span><span class="cx"> return textFragmentIterator.lastHyphenPosition(fragmentToSplit, splitPositionWithHyphen + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TextFragmentIterator::TextFragment splitFragmentToFitLine(TextFragmentIterator::TextFragment& fragmentToSplit, float availableWidth, bool keepAtLeastOneCharacter, const TextFragmentIterator& textFragmentIterator)
</del><ins>+static TextFragmentIterator::TextFragment splitFragmentToFitLine(TextFragmentIterator::TextFragment& fragmentToSplit, float availableWidth, bool lineIsEmpty, const TextFragmentIterator& textFragmentIterator)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: add surrogate pair support.
</span><span class="cx"> unsigned start = fragmentToSplit.start();
</span><span class="lines">@@ -647,9 +652,9 @@
</span><span class="cx"> unsigned splitPosition = (*it);
</span><span class="cx"> // Does first character fit this line?
</span><span class="cx"> if (splitPosition == start) {
</span><del>- if (keepAtLeastOneCharacter)
</del><ins>+ if (lineIsEmpty)
</ins><span class="cx"> ++splitPosition;
</span><del>- } else if (auto hyphenPosition = hyphenPositionForFragment(splitPosition, fragmentToSplit, textFragmentIterator, availableWidth))
</del><ins>+ } else if (auto hyphenPosition = hyphenPositionForFragment(splitPosition, fragmentToSplit, textFragmentIterator, availableWidth, lineIsEmpty))
</ins><span class="cx"> return fragmentToSplit.splitWithHyphen(*hyphenPosition, textFragmentIterator);
</span><span class="cx"> return fragmentToSplit.split(splitPosition, textFragmentIterator);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (213943 => 213944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2017-03-14 21:48:15 UTC (rev 213943)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2017-03-14 21:58:39 UTC (rev 213944)
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.offset()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void tryHyphenating(RenderText& text, const FontCascade& font, const AtomicString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, int availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, std::optional<unsigned> nextBreakable, bool& hyphenated)
</del><ins>+inline void tryHyphenating(RenderText& text, const FontCascade& font, const AtomicString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, float availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, std::optional<unsigned> nextBreakable, bool& hyphenated)
</ins><span class="cx"> {
</span><span class="cx"> // Map 'hyphenate-limit-{before,after}: auto;' to 2.
</span><span class="cx"> unsigned minimumPrefixLength;
</span><span class="lines">@@ -684,7 +684,7 @@
</span><span class="cx"> if (consecutiveHyphenatedLinesLimit >= 0 && consecutiveHyphenatedLines >= static_cast<unsigned>(consecutiveHyphenatedLinesLimit))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int hyphenWidth = measureHyphenWidth(text, font);
</del><ins>+ float hyphenWidth = measureHyphenWidth(text, font);
</ins><span class="cx">
</span><span class="cx"> float maxPrefixWidth = availableWidth - xPos - hyphenWidth - lastSpaceWordSpacing;
</span><span class="cx"> if (!enoughWidthForHyphenation(maxPrefixWidth, font.pixelSize()))
</span></span></pre>
</div>
</div>
</body>
</html>