<!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>[209591] 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/209591">209591</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-12-08 18:06:04 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: locale in WebCore::lastHyphenLocation
https://bugs.webkit.org/show_bug.cgi?id=164182
Reviewed by Zalan Bujtas.
Source/WebCore:
Our hyphenation code assumes the locale is in a small set of known locales.
However, web content can put whatever string it wants in the locale field.
Test: fast/text/hyphenation-unknown-locale.html
* platform/text/cf/HyphenationCF.cpp:
(WebCore::lastHyphenLocation):
* rendering/RenderText.cpp:
(WebCore::maxWordFragmentWidth): When computing the minimum preferred width of
an element, we want to know the size of the widest nonbreakable unit. When
hyphenation is enabled, we have to measure the width of each fragment of each
word (where "fragment" is determined by a substring between two successive
hyphenation points, appended with a hyphen character). A hyphenation point at
string offset 0 is irrelevant for this purpose, because it would lead to an
empty fragment. Therefore, skip this situation.
LayoutTests:
* fast/text/hyphenation-unknown-locale-expected.txt: Added.
* fast/text/hyphenation-unknown-locale.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="#trunkSourceWebCoreplatformtextcfHyphenationCFcpp">trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexthyphenationunknownlocaleexpectedtxt">trunk/LayoutTests/fast/text/hyphenation-unknown-locale-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttexthyphenationunknownlocalehtml">trunk/LayoutTests/fast/text/hyphenation-unknown-locale.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209590 => 209591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-09 01:54:31 UTC (rev 209590)
+++ trunk/LayoutTests/ChangeLog 2016-12-09 02:06:04 UTC (rev 209591)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: locale in WebCore::lastHyphenLocation
+ https://bugs.webkit.org/show_bug.cgi?id=164182
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/text/hyphenation-unknown-locale-expected.txt: Added.
+ * fast/text/hyphenation-unknown-locale.html: Added.
+
</ins><span class="cx"> 2016-12-07 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: m_items.isEmpty() in CustomElementReactionQueue destructor
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexthyphenationunknownlocaleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/hyphenation-unknown-locale-expected.txt (0 => 209591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/hyphenation-unknown-locale-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/hyphenation-unknown-locale-expected.txt 2016-12-09 02:06:04 UTC (rev 209591)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+The test passes if there is no crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexthyphenationunknownlocalehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/hyphenation-unknown-locale.html (0 => 209591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/hyphenation-unknown-locale.html (rev 0)
+++ trunk/LayoutTests/fast/text/hyphenation-unknown-locale.html 2016-12-09 02:06:04 UTC (rev 209591)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<html>
+<head>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+* {
+ letter-spacing: 81in;
+ zoom: 7823
+}
+</style>
+</head>
+<body>
+The test passes if there is no crash.
+<l lang=0><o><e><v><f><n><q>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209590 => 209591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-09 01:54:31 UTC (rev 209590)
+++ trunk/Source/WebCore/ChangeLog 2016-12-09 02:06:04 UTC (rev 209591)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-12-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: locale in WebCore::lastHyphenLocation
+ https://bugs.webkit.org/show_bug.cgi?id=164182
+
+ Reviewed by Zalan Bujtas.
+
+ Our hyphenation code assumes the locale is in a small set of known locales.
+ However, web content can put whatever string it wants in the locale field.
+
+ Test: fast/text/hyphenation-unknown-locale.html
+
+ * platform/text/cf/HyphenationCF.cpp:
+ (WebCore::lastHyphenLocation):
+ * rendering/RenderText.cpp:
+ (WebCore::maxWordFragmentWidth): When computing the minimum preferred width of
+ an element, we want to know the size of the widest nonbreakable unit. When
+ hyphenation is enabled, we have to measure the width of each fragment of each
+ word (where "fragment" is determined by a substring between two successive
+ hyphenation points, appended with a hyphen character). A hyphenation point at
+ string offset 0 is irrelevant for this purpose, because it would lead to an
+ empty fragment. Therefore, skip this situation.
+
</ins><span class="cx"> 2016-12-08 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Always check the return value of pthread_key_create()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextcfHyphenationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp (209590 => 209591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp 2016-12-09 01:54:31 UTC (rev 209590)
+++ trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp 2016-12-09 02:06:04 UTC (rev 209591)
</span><span class="lines">@@ -76,10 +76,9 @@
</span><span class="cx"> size_t lastHyphenLocation(StringView text, size_t beforeIndex, const AtomicString& localeIdentifier)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFLocaleRef> locale = TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier);
</span><del>- ASSERT(locale);
</del><span class="cx">
</span><span class="cx"> CFOptionFlags searchAcrossWordBoundaries = 1;
</span><del>- CFIndex result = CFStringGetHyphenationLocationBeforeIndex(text.createCFStringWithoutCopying().get(), beforeIndex, CFRangeMake(0, text.length()), searchAcrossWordBoundaries, locale.get(), 0);
</del><ins>+ CFIndex result = CFStringGetHyphenationLocationBeforeIndex(text.createCFStringWithoutCopying().get(), beforeIndex, CFRangeMake(0, text.length()), searchAcrossWordBoundaries, locale.get(), nullptr);
</ins><span class="cx"> return result == kCFNotFound ? 0 : result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (209590 => 209591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2016-12-09 01:54:31 UTC (rev 209590)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2016-12-09 02:06:04 UTC (rev 209591)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> Vector<int, 8> hyphenLocations;
</span><span class="cx"> ASSERT(word.length() >= minimumSuffixLength);
</span><span class="cx"> unsigned hyphenLocation = word.length() - minimumSuffixLength;
</span><del>- while ((hyphenLocation = lastHyphenLocation(word, hyphenLocation, style.locale())) >= minimumPrefixLength)
</del><ins>+ while ((hyphenLocation = lastHyphenLocation(word, hyphenLocation, style.locale())) >= std::max(minimumPrefixLength, 1U))
</ins><span class="cx"> hyphenLocations.append(hyphenLocation);
</span><span class="cx">
</span><span class="cx"> if (hyphenLocations.isEmpty())
</span><span class="lines">@@ -750,6 +750,7 @@
</span><span class="cx">
</span><span class="cx"> hyphenLocations.reverse();
</span><span class="cx">
</span><ins>+ // FIXME: Breaking the string at these places in the middle of words is completely broken with complex text.
</ins><span class="cx"> float minimumFragmentWidthToConsider = font.pixelSize() * 5 / 4 + hyphenWidth(renderer, font);
</span><span class="cx"> float maxFragmentWidth = 0;
</span><span class="cx"> for (size_t k = 0; k < hyphenLocations.size(); ++k) {
</span></span></pre>
</div>
</div>
</body>
</html>