<!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>[197423] 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/197423">197423</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-03-01 16:00:02 -0800 (Tue, 01 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT in platform/graphics/mac/ComplexTextController.cpp::capitalize()
https://bugs.webkit.org/show_bug.cgi?id=154875
Reviewed by Myles C. Maxfield.
Source/WebCore:
Change an ASSERT to verify that uper casing a character doesn't change its size.
Test: fast/text/regress-154875.html
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::capitalized):
LayoutTests:
New test.
* fast/text/regress-154875-expected.txt: Added.
* fast/text/regress-154875.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="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextregress154875expectedtxt">trunk/LayoutTests/fast/text/regress-154875-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextregress154875html">trunk/LayoutTests/fast/text/regress-154875.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197422 => 197423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-01 23:58:11 UTC (rev 197422)
+++ trunk/LayoutTests/ChangeLog 2016-03-02 00:00:02 UTC (rev 197423)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-01 Michael Saboff <msaboff@apple.com>
+
+ ASSERT in platform/graphics/mac/ComplexTextController.cpp::capitalize()
+ https://bugs.webkit.org/show_bug.cgi?id=154875
+
+ Reviewed by Myles C. Maxfield.
+
+ New test.
+
+ * fast/text/regress-154875-expected.txt: Added.
+ * fast/text/regress-154875.html: Added.
+
</ins><span class="cx"> 2016-03-01 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should simplify StringReplace with an empty replacement string
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextregress154875expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/regress-154875-expected.txt (0 => 197423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/regress-154875-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/regress-154875-expected.txt 2016-03-02 00:00:02 UTC (rev 197423)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock (anonymous) at (0,0) size 784x0
+ RenderInline {SPAN} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,0) size 784x73
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 348x18
+ text run at (0,0) width 180: "Regression test for 154875. "
+ text run at (179,0) width 169: "This test should not crash."
+ RenderBlock {DIV} at (0,34) size 784x21
+ RenderText {#text} at (0,1) size 215x18
+ text run at (0,1) width 168: "This is a Unicode string: \""
+ text run at (167,1) width 15: "\x{600}"
+ text run at (181,1) width 34: " \x{D801}\x{DC29}\x{D801}\x{DC2A}\x{D801}\x{DC2B}\""
+ RenderBlock {DIV} at (0,55) size 784x18
+ RenderText {#text} at (0,0) size 150x18
+ text run at (0,0) width 150: "PASS: Test didn't crash"
+ RenderBlock (anonymous) at (0,73) size 784x0
+ RenderInline {SPAN} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextregress154875html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/regress-154875.html (0 => 197423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/regress-154875.html (rev 0)
+++ trunk/LayoutTests/fast/text/regress-154875.html 2016-03-02 00:00:02 UTC (rev 197423)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+</head>
+<body>
+<span id="span">
+<p id="description">Regression test for 154875. This test should not crash.</p>
+<div id="unicode-text" style="text-transform: small-caps;"></div>
+<div id="console"></div>
+<script>
+ document.getElementById('unicode-text').innerHTML = "This is a Unicode string: \"\u0600 \u{10429}\u{1042a}\u{1042b}\"";
+ document.getElementById('console').innerHTML = "PASS: Test didn't crash";
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197422 => 197423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-01 23:58:11 UTC (rev 197422)
+++ trunk/Source/WebCore/ChangeLog 2016-03-02 00:00:02 UTC (rev 197423)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-01 Michael Saboff <msaboff@apple.com>
+
+ ASSERT in platform/graphics/mac/ComplexTextController.cpp::capitalize()
+ https://bugs.webkit.org/show_bug.cgi?id=154875
+
+ Reviewed by Myles C. Maxfield.
+
+ Change an ASSERT to verify that uper casing a character doesn't change its size.
+
+ Test: fast/text/regress-154875.html
+
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::capitalized):
+
</ins><span class="cx"> 2016-03-01 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Timer alignment in separate web processes should not all sync up to the same point.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (197422 => 197423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-03-01 23:58:11 UTC (rev 197422)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-03-02 00:00:02 UTC (rev 197423)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><span class="cx"> UChar32 uppercaseCharacter = u_toupper(baseCharacter);
</span><del>- ASSERT(uppercaseCharacter == baseCharacter || uppercaseCharacter <= 0xFFFF);
</del><ins>+ ASSERT(uppercaseCharacter == baseCharacter || (U_IS_BMP(baseCharacter) == U_IS_BMP(uppercaseCharacter)));
</ins><span class="cx"> if (uppercaseCharacter != baseCharacter)
</span><span class="cx"> return uppercaseCharacter;
</span><span class="cx"> return Nullopt;
</span></span></pre>
</div>
</div>
</body>
</html>