<!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>[211680] 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/211680">211680</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-02-05 06:41:10 -0800 (Sun, 05 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Bail out from Simple Line Layout on surrogate pairs.
https://bugs.webkit.org/show_bug.cgi?id=167840
<rdar://problem/30364784>
Reviewed by Myles C. Maxfield.
Source/WebCore:
Surrogate pairs require special line breaking logic.
Test: fast/text/simple-line-layout-no-surrogate-pairs.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForCharacter):
(WebCore::SimpleLineLayout::canUseForText): Checking against special characters is faster than
checking against glyphs. Reverse their order.
(WebCore::SimpleLineLayout::printReason):
LayoutTests:
* fast/text/simple-line-layout-no-surrogate-pairs-expected.html: Added.
* fast/text/simple-line-layout-no-surrogate-pairs.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="#trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairsexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairshtml">trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211679 => 211680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-05 07:19:53 UTC (rev 211679)
+++ trunk/LayoutTests/ChangeLog 2017-02-05 14:41:10 UTC (rev 211680)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-05 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Bail out from Simple Line Layout on surrogate pairs.
+ https://bugs.webkit.org/show_bug.cgi?id=167840
+ <rdar://problem/30364784>
+
+ Reviewed by Myles C. Maxfield.
+
+ * fast/text/simple-line-layout-no-surrogate-pairs-expected.html: Added.
+ * fast/text/simple-line-layout-no-surrogate-pairs.html: Added.
+
</ins><span class="cx"> 2017-02-03 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r204858): Synthetic bold text in vertical writing mode is rotated away from original text
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html (0 => 211680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html 2017-02-05 14:41:10 UTC (rev 211680)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we don't use simple line layout for surrogate pairs.</title>
+</head>
+<body></body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html (0 => 211680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html 2017-02-05 14:41:10 UTC (rev 211680)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>This tests that we don't use simple line layout for surrogate pairs.</title>
+<style>
+div {
+ color: white;
+ font-family: Arial;
+}
+</style>
+<script>
+if (window.internals) {
+ internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
+ internals.settings.setSimpleLineLayoutEnabled(true);
+}
+</script>
+</head>
+<body>
+<div>&#xd800;</div>
+<div>&#x1D306;</div>
+<div>&#xdb7f;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211679 => 211680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-05 07:19:53 UTC (rev 211679)
+++ trunk/Source/WebCore/ChangeLog 2017-02-05 14:41:10 UTC (rev 211680)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-05 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Bail out from Simple Line Layout on surrogate pairs.
+ https://bugs.webkit.org/show_bug.cgi?id=167840
+ <rdar://problem/30364784>
+
+ Reviewed by Myles C. Maxfield.
+
+ Surrogate pairs require special line breaking logic.
+
+ Test: fast/text/simple-line-layout-no-surrogate-pairs.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForCharacter):
+ (WebCore::SimpleLineLayout::canUseForText): Checking against special characters is faster than
+ checking against glyphs. Reverse their order.
+ (WebCore::SimpleLineLayout::printReason):
+
</ins><span class="cx"> 2017-02-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Static Analyzer: WebCoreNSURLExtras.mm: Potential leak of memory pointed to by 'allBytesBuffer'
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (211679 => 211680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-02-05 07:19:53 UTC (rev 211679)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-02-05 14:41:10 UTC (rev 211680)
</span><span class="lines">@@ -113,7 +113,8 @@
</span><span class="cx"> FlowChildIsSelected = 1LLU << 47,
</span><span class="cx"> FlowHasHangingPunctuation = 1LLU << 48,
</span><span class="cx"> FlowFontHasOverflowGlyph = 1LLU << 49,
</span><del>- EndOfReasons = 1LLU << 50
</del><ins>+ FlowTextHasSurrogatePair = 1LLU << 50,
+ EndOfReasons = 1LLU << 51
</ins><span class="cx"> };
</span><span class="cx"> const unsigned NoReason = 0;
</span><span class="cx">
</span><span class="lines">@@ -150,6 +151,9 @@
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasJustifiedNonLatinText, reasons, includeReasons);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (U16_IS_SURROGATE(character))
+ SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasSurrogatePair, reasons, includeReasons);
+
</ins><span class="cx"> UCharDirection direction = u_charDirection(character);
</span><span class="cx"> if (direction == U_RIGHT_TO_LEFT || direction == U_RIGHT_TO_LEFT_ARABIC
</span><span class="cx"> || direction == U_RIGHT_TO_LEFT_EMBEDDING || direction == U_RIGHT_TO_LEFT_OVERRIDE
</span><span class="lines">@@ -179,6 +183,10 @@
</span><span class="cx"> if (character == softHyphen)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasSoftHyphen, reasons, includeReasons);
</span><span class="cx">
</span><ins>+ auto characterReasons = canUseForCharacter(character, textIsJustified, includeReasons);
+ if (characterReasons != NoReason)
+ SET_REASON_AND_RETURN_IF_NEEDED(characterReasons, reasons, includeReasons);
+
</ins><span class="cx"> auto glyphData = fontCascade.glyphDataForCharacter(character, false);
</span><span class="cx"> if (!glyphData.isValid() || glyphData.font != &primaryFont)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowPrimaryFontIsInsufficient, reasons, includeReasons);
</span><span class="lines">@@ -185,10 +193,6 @@
</span><span class="cx">
</span><span class="cx"> if (lineHeightConstraint && primaryFont.boundsForGlyph(glyphData.glyph).height() > *lineHeightConstraint)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowFontHasOverflowGlyph, reasons, includeReasons);
</span><del>-
- auto characterReasons = canUseForCharacter(character, textIsJustified, includeReasons);
- if (characterReasons != NoReason)
- SET_REASON_AND_RETURN_IF_NEEDED(characterReasons, reasons, includeReasons);
</del><span class="cx"> }
</span><span class="cx"> return reasons;
</span><span class="cx"> }
</span><span class="lines">@@ -1080,6 +1084,9 @@
</span><span class="cx"> case FlowFontHasOverflowGlyph:
</span><span class="cx"> stream << "-webkit-line-box-contain: glyphs with overflowing text.";
</span><span class="cx"> break;
</span><ins>+ case FlowTextHasSurrogatePair:
+ stream << "surrogate pair";
+ break;
</ins><span class="cx"> case FlowTextIsEmpty:
</span><span class="cx"> case FlowHasNoChild:
</span><span class="cx"> case FlowHasNoParent:
</span></span></pre>
</div>
</div>
</body>
</html>