<!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>[188966] 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/188966">188966</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-26 08:53:00 -0700 (Wed, 26 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/188960">r188960</a>.
https://bugs.webkit.org/show_bug.cgi?id=148479
Broke all the tests (Requested by ap on #webkit).
Reverted changeset:
"Add some new emoji with modifiers and new sequence."
https://bugs.webkit.org/show_bug.cgi?id=148202
http://trac.webkit.org/changeset/188960</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingdeletingdeleteemojiexpectedtxt">trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingdeletingdeleteemojihtml">trunk/LayoutTests/editing/deleting/delete-emoji.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextCharacterPropertiesh">trunk/Source/WebCore/platform/text/CharacterProperties.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorcpp">trunk/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/LayoutTests/ChangeLog        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-26 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r188960.
+ https://bugs.webkit.org/show_bug.cgi?id=148479
+
+ Broke all the tests (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Add some new emoji with modifiers and new sequence."
+ https://bugs.webkit.org/show_bug.cgi?id=148202
+ http://trac.webkit.org/changeset/188960
+
</ins><span class="cx"> 2015-08-25 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: no need to allocate protocolErrors array for every dispatched backend command
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeleteemojiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -1,65 +1,38 @@
</span><span class="cx"> This test verifies that emoji groups and emoji with variations are deleted correctly
</span><span class="cx">
</span><span class="cx"> Dump of markup 1:
</span><del>-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎππΎπβπ¨<#selection-caret>
</del><ins>+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»<#selection-caret>
</ins><span class="cx"> "
</span><span class="cx">
</span><span class="cx"> Dump of markup 2:
</span><del>-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎππΎ<#selection-caret>"
-
-Dump of markup 3:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎ<#selection-caret>"
-
-Dump of markup 4:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎ<#selection-caret>"
-
-Dump of markup 5:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎ<#selection-caret>"
-
-Dump of markup 6:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎ<#selection-caret>"
-
-Dump of markup 7:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎ<#selection-caret>"
-
-Dump of markup 8:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎ<#selection-caret>"
-
-Dump of markup 9:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎ<#selection-caret>"
-
-Dump of markup 10:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»<#selection-caret>"
-
-Dump of markup 11:
</del><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 12:
</del><ins>+Dump of markup 3:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 13:
</del><ins>+Dump of markup 4:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 14:
</del><ins>+Dump of markup 5:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 15:
</del><ins>+Dump of markup 6:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 16:
</del><ins>+Dump of markup 7:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 17:
</del><ins>+Dump of markup 8:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 18:
</del><ins>+Dump of markup 9:
</ins><span class="cx"> | "π¦π»π¦πΎπ»<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 19:
</del><ins>+Dump of markup 10:
</ins><span class="cx"> | "π¦π»π¦πΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 20:
</del><ins>+Dump of markup 11:
</ins><span class="cx"> | "π¦π»<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 21:
</del><ins>+Dump of markup 12:
</ins><span class="cx"> | <br>
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeleteemojihtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/delete-emoji.html (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-emoji.html        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/LayoutTests/editing/deleting/delete-emoji.html        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <body>
</span><del>-<div id="test" contenteditable="true">&#x1F466;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F466;&#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F468;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F468;&#x261D;&#xFE0F;&#x1F3FB;&#x270D;&#x1F3FE;&#x26F9;&#x1F3FE;&#x1F590;&#x1F3FE;&#x1F595;&#x1F3FE;&#x1F918;&#x1F3FE;&#x1F575;&#x1F3FE;&#x1F574;&#x1F3FE;&#x1F3CB;&#x1F3FE;&#x1F441;&#x200D;&#x1F5E8;
</del><ins>+<div id="test" contenteditable="true">&#x1F466;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F466;&#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F468;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F468;&#x261D;&#xFE0F;&#x1F3FB;
</ins><span class="cx"> </div>
</span><span class="cx"> <script src="../../resources/dump-as-markup.js"></script>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/Source/WebCore/ChangeLog        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-26 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r188960.
+ https://bugs.webkit.org/show_bug.cgi?id=148479
+
+ Broke all the tests (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Add some new emoji with modifiers and new sequence."
+ https://bugs.webkit.org/show_bug.cgi?id=148202
+ http://trac.webkit.org/changeset/188960
+
</ins><span class="cx"> 2015-08-25 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] "method" property for the webkitwebsrc element
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -751,7 +751,7 @@
</span><span class="cx"> if (supplementaryCharacter <= 0x1F1FF)
</span><span class="cx"> return Complex;
</span><span class="cx">
</span><del>- if (supplementaryCharacter == 0x1F441 || supplementaryCharacter == 0x1F5E8 || (supplementaryCharacter >= 0x1F466 && supplementaryCharacter <= 0x1F469)) {
</del><ins>+ if (supplementaryCharacter >= 0x1F466 && supplementaryCharacter <= 0x1F469) {
</ins><span class="cx"> previousCharacterIsEmojiGroupCandidate = true;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextCharacterPropertiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/CharacterProperties.h (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/CharacterProperties.h        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/Source/WebCore/platform/text/CharacterProperties.h        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -30,8 +30,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool isEmojiGroupCandidate(UChar32 character)
</span><span class="cx"> {
</span><del>- return (character >= 0x1F466 && character <= 0x1F469) || character == 0x2764 || character == 0x1F48B
- || character == 0x1F441 || character == 0x1F5E8;
</del><ins>+ return (character >= 0x1F466 && character <= 0x1F469) || character == 0x2764 || character == 0x1F48B;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isEmojiModifier(UChar32 character)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (188965 => 188966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp        2015-08-26 14:34:38 UTC (rev 188965)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp        2015-08-26 15:53:00 UTC (rev 188966)
</span><span class="lines">@@ -210,20 +210,19 @@
</span><span class="cx"> "$RI = [\\U0001F1E6-\\U0001F1FF];" // Emoji regional indicators
</span><span class="cx"> "$ZWJ = \\u200D;" // Zero width joiner
</span><span class="cx"> "$EmojiVar = [\\uFE0F];" // Emoji-style variation selector
</span><del>- "$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];" // Emoji that participate in ZWJ sequences
- "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
</del><ins>+ "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];" // Emoji that participate in ZWJ sequences
+ "$EmojiForMods = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> "$EmojiMods = [\\U0001F3FB-\\U0001F3FF];" // Fitzpatrick modifiers
</span><span class="cx"> "!!chain;"
</span><del>- "!!RINoChain;"
</del><span class="cx"> "!!forward;"
</span><span class="cx"> "$CR $LF;"
</span><span class="cx"> "$L ($L | $V | $LV | $LVT);"
</span><span class="cx"> "($LV | $V) ($V | $T);"
</span><span class="cx"> "($LVT | $T) $T;"
</span><del>- "$RI $RI $Extend* / $RI;"
- "$RI $RI $Extend*;"
</del><span class="cx"> "[^$Control $CR $LF] $Extend;"
</span><span class="cx"> "[^$Control $CR $LF] $SpacingMark;"
</span><ins>+ "$RI $RI / $RI;"
+ "$RI $RI;"
</ins><span class="cx"> "$Hin0 $HinV $Hin1;" // Devanagari Virama (forward)
</span><span class="cx"> "$Ben0 $BenV $Ben1;" // Bengali Virama (forward)
</span><span class="cx"> "$Pan0 $PanV $Pan1;" // Gurmukhi Virama (forward)
</span><span class="lines">@@ -239,10 +238,10 @@
</span><span class="cx"> "($L | $V | $LV | $LVT) $L;"
</span><span class="cx"> "($V | $T) ($LV | $V);"
</span><span class="cx"> "$T ($LVT | $T);"
</span><del>- "$Extend* $RI $RI / $Extend* $RI $RI;"
- "$Extend* $RI $RI;"
</del><span class="cx"> "$Extend [^$Control $CR $LF];"
</span><span class="cx"> "$SpacingMark [^$Control $CR $LF];"
</span><ins>+ "$RI $RI / $RI $RI;"
+ "$RI $RI;"
</ins><span class="cx"> "$Hin1 $HinV $Hin0;" // Devanagari Virama (backward)
</span><span class="cx"> "$Ben1 $BenV $Ben0;" // Bengali Virama (backward)
</span><span class="cx"> "$Pan1 $PanV $Pan0;" // Gurmukhi Virama (backward)
</span><span class="lines">@@ -253,12 +252,10 @@
</span><span class="cx"> "$Mal1 $MalV $Mal0;" // Malayalam Virama (backward)
</span><span class="cx"> "$EmojiForSeqs $ZWJ;" // Don't break in emoji ZWJ sequences
</span><span class="cx"> "$EmojiMods $EmojiVar? $EmojiForMods;" // Don't break between relevant emoji (possibly with variation selector) and Fitzpatrick modifier
</span><del>- "!!safe_reverse;"
- "$RI $RI+;"
</del><span class="cx"> "[$EmojiVar $EmojiMods]+ $EmojiForMods;"
</span><del>- "!!safe_forward;"
- "$RI $RI+;"
- "$EmojiForMods [$EmojiVar $EmojiMods]+;";
</del><ins>+ "$EmojiForMods [$EmojiVar $EmojiMods]+;"
+ "!!safe_reverse;"
+ "!!safe_forward;";
</ins><span class="cx"> static TextBreakIterator* staticCursorMovementIterator = initializeIteratorWithRules(kRules);
</span><span class="cx"> #else // PLATFORM(IOS)
</span><span class="cx"> // Use the special Thai character break iterator for all locales
</span><span class="lines">@@ -405,7 +402,6 @@
</span><span class="cx"> "$PO = [[:LineBreak = Postfix_Numeric:] - $PO_SUB];"
</span><span class="cx"> "$PR = [[:LineBreak = Prefix_Numeric:] - $PR_SUB];"
</span><span class="cx"> "$QU = [:LineBreak = Quotation:];"
</span><del>- "$RI = [\\U0001F1E6-\\U0001F1FF];"
</del><span class="cx"> "$SA = [:LineBreak = Complex_Context:];"
</span><span class="cx"> "$SG = [:LineBreak = Surrogate:];"
</span><span class="cx"> "$SP = [:LineBreak = Space:];"
</span><span class="lines">@@ -415,8 +411,8 @@
</span><span class="cx"> "$ZW = [:LineBreak = ZWSpace:];"
</span><span class="cx"> "$ZWJ = \\u200D;"
</span><span class="cx"> "$EmojiVar = \\uFE0F;"
</span><del>- "$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];"
- "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
</del><ins>+ "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];"
+ "$EmojiForMods = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> "$EmojiMods = [\\U0001F3FB-\\U0001F3FF];"
</span><span class="cx"> "$dictionary = [:LineBreak = Complex_Context:];"
</span><span class="cx"> "$ALPlus = [$AL $AI $SA $SG $XX];"
</span><span class="lines">@@ -444,7 +440,6 @@
</span><span class="cx"> "$POcm = $PO $CM*;"
</span><span class="cx"> "$PRcm = $PR $CM*;"
</span><span class="cx"> "$QUcm = $QU $CM*;"
</span><del>- "$RIcm = $QU $CM*;"
</del><span class="cx"> "$SYcm = $SY $CM*;"
</span><span class="cx"> "$WJcm = $WJ $CM*;";
</span><span class="cx">
</span><span class="lines">@@ -563,7 +558,6 @@
</span><span class="cx"> "($ALcm | $HLcm | $NUcm) $OPcm;"
</span><span class="cx"> "$CM+ $OPcm;"
</span><span class="cx"> "$CPcm ($ALcm | $HLcm | $NUcm);"
</span><del>- "$RIcm $RIcm;"
</del><span class="cx"> "$EmojiForMods $EmojiVar? $EmojiMods;";
</span><span class="cx">
</span><span class="cx"> static const char* uax14Reverse =
</span><span class="lines">@@ -592,7 +586,6 @@
</span><span class="cx"> "$CM+ $PO;"
</span><span class="cx"> "$CM+ $PR;"
</span><span class="cx"> "$CM+ $QU;"
</span><del>- "$CM+ $RI;"
</del><span class="cx"> "$CM+ $SY;"
</span><span class="cx"> "$CM+ $WJ;"
</span><span class="cx"> "$CM+;"
</span><span class="lines">@@ -661,7 +654,6 @@
</span><span class="cx"> "$CM* ($ALPlus | $HL) $CM* $IS;"
</span><span class="cx"> "$CM* $OP $CM* ($ALPlus | $HL | $NU);"
</span><span class="cx"> "$CM* ($ALPlus | $HL | $NU) $CM* $CP;"
</span><del>- "$CM* $RI $CM* $RI;"
</del><span class="cx"> "$EmojiMods $EmojiVar? $EmojiForMods;";
</span><span class="cx">
</span><span class="cx"> static const char* uax14SafeForward =
</span></span></pre>
</div>
</div>
</body>
</html>