<!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>[210948] 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/210948">210948</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-19 18:52:34 -0800 (Thu, 19 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Extend coverage for justified content.
https://bugs.webkit.org/show_bug.cgi?id=167219
<rdar://problem/30108391>
Reviewed by Antti Koivisto.
Source/WebCore:
Add support for general punctuation characters (0x2010, 0x2027) and latin characters including Extended-B.
Test: fast/text/simple-line-layout-with-justified-punctuation.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForText):
(WebCore::SimpleLineLayout::canUseForFontAndText):
LayoutTests:
* fast/text/simple-line-layout-with-justified-punctuation-expected.html: Added.
* fast/text/simple-line-layout-with-justified-punctuation.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="#trunkLayoutTestsfasttextsimplelinelayoutwithjustifiedpunctuationexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutwithjustifiedpunctuationhtml">trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210947 => 210948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-20 02:38:45 UTC (rev 210947)
+++ trunk/LayoutTests/ChangeLog 2017-01-20 02:52:34 UTC (rev 210948)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-19 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Extend coverage for justified content.
+ https://bugs.webkit.org/show_bug.cgi?id=167219
+ <rdar://problem/30108391>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/text/simple-line-layout-with-justified-punctuation-expected.html: Added.
+ * fast/text/simple-line-layout-with-justified-punctuation.html: Added.
+
</ins><span class="cx"> 2017-01-19 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> CRASH at WebCore::TrackListBase::remove
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutwithjustifiedpunctuationexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation-expected.html (0 => 210948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation-expected.html 2017-01-20 02:52:34 UTC (rev 210948)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>This tests that we renderer justified punctuation content correctly with simple line layout</title>
+<style>
+div {
+ text-align: justify;
+ width: 200px;
+}
+</style>
+<script>
+if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+</script>
+</head>
+<body>
+<div>foobar &#x2010; foobar &#x2011; foobar &#x2012; foobar &#x2013;</div>
+<div>foobar &#x2014; foobar &#x2015; foobar &#x2016; foobar &#x2017;</div>
+<div>foobar &#x2018; foobar &#x2019; foobar &#x201A; foobar &#x201B;</div>
+<div>foobar &#x201C; foobar &#x201D; foobar &#x201E; foobar &#x201F;</div>
+<div>foobar &#x2020; foobar &#x2021; foobar &#x2022; foobar &#x2023;</div>
+<div>foobar &#x2024; foobar &#x2025; foobar &#x2026; foobar &#x2027;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutwithjustifiedpunctuationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation.html (0 => 210948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-with-justified-punctuation.html 2017-01-20 02:52:34 UTC (rev 210948)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>This tests that we renderer justified punctuation content correctly with simple line layout</title>
+<style>
+div {
+ text-align: justify;
+ width: 200px;
+}
+</style>
+</head>
+<body>
+<div>foobar &#x2010; foobar &#x2011; foobar &#x2012; foobar &#x2013;</div>
+<div>foobar &#x2014; foobar &#x2015; foobar &#x2016; foobar &#x2017;</div>
+<div>foobar &#x2018; foobar &#x2019; foobar &#x201A; foobar &#x201B;</div>
+<div>foobar &#x201C; foobar &#x201D; foobar &#x201E; foobar &#x201F;</div>
+<div>foobar &#x2020; foobar &#x2021; foobar &#x2022; foobar &#x2023;</div>
+<div>foobar &#x2024; foobar &#x2025; foobar &#x2026; foobar &#x2027;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210947 => 210948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-20 02:38:45 UTC (rev 210947)
+++ trunk/Source/WebCore/ChangeLog 2017-01-20 02:52:34 UTC (rev 210948)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-19 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Extend coverage for justified content.
+ https://bugs.webkit.org/show_bug.cgi?id=167219
+ <rdar://problem/30108391>
+
+ Reviewed by Antti Koivisto.
+
+ Add support for general punctuation characters (0x2010, 0x2027) and latin characters including Extended-B.
+
+ Test: fast/text/simple-line-layout-with-justified-punctuation.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForText):
+ (WebCore::SimpleLineLayout::canUseForFontAndText):
+
</ins><span class="cx"> 2017-01-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Construct URLSearchParams from array or object
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (210947 => 210948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-20 02:38:45 UTC (rev 210947)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-20 02:52:34 UTC (rev 210948)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static AvoidanceReasonFlags canUseForText(const CharacterType* text, unsigned length, const Font& font, IncludeReasons includeReasons)
</del><ins>+static AvoidanceReasonFlags canUseForText(const CharacterType* text, unsigned length, const Font& font, bool textIsJustified, IncludeReasons includeReasons)
</ins><span class="cx"> {
</span><span class="cx"> AvoidanceReasonFlags reasons = { };
</span><span class="cx"> // FIXME: <textarea maxlength=0> generates empty text node.
</span><span class="lines">@@ -148,6 +148,14 @@
</span><span class="cx"> if (character == ' ')
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ if (textIsJustified) {
+ // Include characters up to Latin Extended-B and some punctuation range when text is justified.
+ bool isLatinIncludingExtendedB = character <= 0x01FF;
+ bool isPunctuationRange = character >= 0x2010 && character <= 0x2027;
+ if (!(isLatinIncludingExtendedB || isPunctuationRange))
+ SET_REASON_AND_RETURN_IF_NEEDED(FlowHasJustifiedNonLatinText, reasons, includeReasons);
+ }
+
</ins><span class="cx"> // These would be easy to support.
</span><span class="cx"> if (character == noBreakSpace)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasNoBreakSpace, reasons, includeReasons);
</span><span class="lines">@@ -167,11 +175,11 @@
</span><span class="cx"> return reasons;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static AvoidanceReasonFlags canUseForText(const RenderText& textRenderer, const Font& font, IncludeReasons includeReasons)
</del><ins>+static AvoidanceReasonFlags canUseForText(const RenderText& textRenderer, const Font& font, bool textIsJustified, IncludeReasons includeReasons)
</ins><span class="cx"> {
</span><span class="cx"> if (textRenderer.is8Bit())
</span><del>- return canUseForText(textRenderer.characters8(), textRenderer.textLength(), font, includeReasons);
- return canUseForText(textRenderer.characters16(), textRenderer.textLength(), font, includeReasons);
</del><ins>+ return canUseForText(textRenderer.characters8(), textRenderer.textLength(), font, false, includeReasons);
+ return canUseForText(textRenderer.characters16(), textRenderer.textLength(), font, textIsJustified, includeReasons);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static AvoidanceReasonFlags canUseForFontAndText(const RenderBlockFlow& flow, IncludeReasons includeReasons)
</span><span class="lines">@@ -183,9 +191,8 @@
</span><span class="cx"> if (primaryFont.isLoading())
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowIsMissingPrimaryFont, reasons, includeReasons);
</span><span class="cx">
</span><ins>+ bool flowIsJustified = style.textAlign() == JUSTIFY;
</ins><span class="cx"> for (const auto& textRenderer : childrenOfType<RenderText>(flow)) {
</span><del>- if (style.textAlign() == JUSTIFY && !textRenderer.originalText().containsOnlyLatin1())
- SET_REASON_AND_RETURN_IF_NEEDED(FlowHasJustifiedNonLatinText, reasons, includeReasons);
</del><span class="cx"> if (textRenderer.isCombineText())
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowTextIsCombineText, reasons, includeReasons);
</span><span class="cx"> if (textRenderer.isCounter())
</span><span class="lines">@@ -199,7 +206,7 @@
</span><span class="cx"> if (style.fontCascade().codePath(TextRun(textRenderer.text())) != FontCascade::Simple)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowFontIsNotSimple, reasons, includeReasons);
</span><span class="cx">
</span><del>- auto textReasons = canUseForText(textRenderer, primaryFont, includeReasons);
</del><ins>+ auto textReasons = canUseForText(textRenderer, primaryFont, flowIsJustified, includeReasons);
</ins><span class="cx"> if (textReasons != NoReason)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(textReasons, reasons, includeReasons);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>