<!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>[180087] 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/180087">180087</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 15:44:02 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Additional emoji group support.
https://bugs.webkit.org/show_bug.cgi?id=141539
rdar://problem/19727527
Reviewed by Sam Weinig.
Source/WebCore:
Adding some new emoji ligatures.
Updated existing test to include the new sequences.
* platform/text/TextBreakIterator.cpp:
(WebCore::cursorMovementIterator):
* rendering/RenderText.cpp:
(WebCore::isEmojiGroupCandidate):
LayoutTests:
Updating test to reflect the new emoji ligatures supported.
* editing/deleting/delete-emoji-expected.txt:
* editing/deleting/delete-emoji.html:</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="#trunkSourceWebCoreplatformtextTextBreakIteratorcpp">trunk/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180086 => 180087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-13 23:27:16 UTC (rev 180086)
+++ trunk/LayoutTests/ChangeLog 2015-02-13 23:44:02 UTC (rev 180087)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-12 Enrica Casucci <enrica@apple.com>
+
+ Additional emoji group support.
+ https://bugs.webkit.org/show_bug.cgi?id=141539
+ rdar://problem/19727527
+
+ Reviewed by Sam Weinig.
+
+ Updating test to reflect the new emoji ligatures supported.
+
+ * editing/deleting/delete-emoji-expected.txt:
+ * editing/deleting/delete-emoji.html:
+
</ins><span class="cx"> 2015-02-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Document some debug asserts in Accessibility (Windows) tests.
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeleteemojiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt (180086 => 180087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-02-13 23:27:16 UTC (rev 180086)
+++ trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-02-13 23:44:02 UTC (rev 180087)
</span><span class="lines">@@ -1,17 +1,29 @@
</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><ins>+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©<#selection-caret>"
+
+Dump of markup 3:
+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨<#selection-caret>"
+
+Dump of markup 4:
+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©<#selection-caret>"
+
+Dump of markup 5:
+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦<#selection-caret>"
+
+Dump of markup 6:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 3:
</del><ins>+Dump of markup 7:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 4:
</del><ins>+Dump of markup 8:
</ins><span class="cx"> | "π¦π»π¦πΎπ»<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 5:
</del><ins>+Dump of markup 9:
</ins><span class="cx"> | "π¦π»π¦πΎ<#selection-caret>"
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeleteemojihtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/delete-emoji.html (180086 => 180087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-emoji.html 2015-02-13 23:27:16 UTC (rev 180086)
+++ trunk/LayoutTests/editing/deleting/delete-emoji.html 2015-02-13 23:44:02 UTC (rev 180087)
</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;
</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;
</ins><span class="cx"> </div>
</span><span class="cx"> <script src="../../resources/dump-as-markup.js"></script>
</span><span class="cx"> <script>
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> var selection = window.getSelection();
</span><span class="cx"> var testElement = document.getElementById('test');
</span><del>-selection.setBaseAndExtent(testElement.firstChild, 20, testElement.firstChild, 20);
</del><ins>+selection.setBaseAndExtent(testElement.firstChild, 56, testElement.firstChild, 56);
</ins><span class="cx"> Markup.dump("test");
</span><span class="cx"> document.execCommand("Delete");
</span><span class="cx"> Markup.dump("test");
</span><span class="lines">@@ -19,6 +19,14 @@
</span><span class="cx"> Markup.dump("test");
</span><span class="cx"> document.execCommand("Delete");
</span><span class="cx"> Markup.dump("test");
</span><ins>+document.execCommand("Delete");
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180086 => 180087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-13 23:27:16 UTC (rev 180086)
+++ trunk/Source/WebCore/ChangeLog 2015-02-13 23:44:02 UTC (rev 180087)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-12 Enrica Casucci <enrica@apple.com>
+
+ Additional emoji group support.
+ https://bugs.webkit.org/show_bug.cgi?id=141539
+ rdar://problem/19727527
+
+ Reviewed by Sam Weinig.
+
+ Adding some new emoji ligatures.
+ Updated existing test to include the new sequences.
+
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::cursorMovementIterator):
+ * rendering/RenderText.cpp:
+ (WebCore::isEmojiGroupCandidate):
+
</ins><span class="cx"> 2015-02-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Really stop using export files.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (180086 => 180087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-02-13 23:27:16 UTC (rev 180086)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-02-13 23:44:02 UTC (rev 180087)
</span><span class="lines">@@ -208,8 +208,9 @@
</span><span class="cx"> "$Mal1 = [\\u0D15-\\u0D39];" // Malayalam Letter A,...,Ha
</span><span class="cx"> "$RI = [\\U0001F1E6-\\U0001F1FF];" // Emoji regional indicators
</span><span class="cx"> "$ZWJ = \\u200D;" // Zero width joiner
</span><del>- "$EmojiForModsAndSeqs = [\\U0001F466-\\U0001F469];" // Emoji that take Fitzpatrick modifiers AND participate in ZWJ sequences
- "$EmojiForModsOnly = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6B4-\\U0001F6B6 \\U0001F6C0];" // Emoji that take Fitzpatrick modifiers
</del><ins>+ "$EmojiVar = [\\uFE0F];" // Emoji-style variation selector
+ "$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 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6B4-\\U0001F6B6 \\U0001F6C0];" // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> "$EmojiMods = [\\U0001F3FB-\\U0001F3FF];" // Fitzpatrick modifiers
</span><span class="cx"> "!!chain;"
</span><span class="cx"> "!!forward;"
</span><span class="lines">@@ -229,8 +230,8 @@
</span><span class="cx"> "$Tel0 $TelV $Tel1;" // Telugu Virama (forward)
</span><span class="cx"> "$Kan0 $KanV $Kan1;" // Kannada Virama (forward)
</span><span class="cx"> "$Mal0 $MalV $Mal1;" // Malayalam Virama (forward)
</span><del>- "$ZWJ $EmojiForModsAndSeqs;" // Don't break in emoji ZWJ sequences
- "[$EmojiForModsAndSeqs $EmojiForModsOnly] $EmojiMods;" // Don't break between relevant emoji and Fitzpatrick modifier
</del><ins>+ "$ZWJ $EmojiForSeqs;" // Don't break in emoji ZWJ sequences
+ "$EmojiForMods $EmojiVar? $EmojiMods;" // Don't break between relevant emoji (possibly with variation selector) and Fitzpatrick modifier
</ins><span class="cx"> "!!reverse;"
</span><span class="cx"> "$LF $CR;"
</span><span class="cx"> "($L | $V | $LV | $LVT) $L;"
</span><span class="lines">@@ -248,8 +249,10 @@
</span><span class="cx"> "$Tel1 $TelV $Tel0;" // Telugu Virama (backward)
</span><span class="cx"> "$Kan1 $KanV $Kan0;" // Kannada Virama (backward)
</span><span class="cx"> "$Mal1 $MalV $Mal0;" // Malayalam Virama (backward)
</span><del>- "$EmojiForModsAndSeqs $ZWJ;" // Don't break in emoji ZWJ sequences
- "$EmojiMods [$EmojiForModsAndSeqs $EmojiForModsOnly];" // Don't break between relevant emoji and Fitzpatrick modifier
</del><ins>+ "$EmojiForSeqs $ZWJ;" // Don't break in emoji ZWJ sequences
+ "$EmojiMods $EmojiVar? $EmojiForMods;" // Don't break between relevant emoji (possibly with variation selector) and Fitzpatrick modifier
+ "[$EmojiVar $EmojiMods]+ $EmojiForMods;"
+ "$EmojiForMods [$EmojiVar $EmojiMods]+;"
</ins><span class="cx"> "!!safe_reverse;"
</span><span class="cx"> "!!safe_forward;";
</span><span class="cx"> static TextBreakIterator* staticCursorMovementIterator = initializeIteratorWithRules(kRules);
</span><span class="lines">@@ -406,8 +409,9 @@
</span><span class="cx"> "$XX = [:LineBreak = Unknown:];"
</span><span class="cx"> "$ZW = [:LineBreak = ZWSpace:];"
</span><span class="cx"> "$ZWJ = \\u200D;"
</span><del>- "$EmojiForModsAndSeqs = [\\U0001F466-\\U0001F469];"
- "$EmojiForModsOnly = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6B4-\\U0001F6B6 \\U0001F6C0];"
</del><ins>+ "$EmojiVar = \\uFE0F;"
+ "$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 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6B4-\\U0001F6B6 \\U0001F6C0];"
</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">@@ -485,7 +489,7 @@
</span><span class="cx"> "$LB4NonBreaks [$SP $ZW];"
</span><span class="cx"> "$CAN_CM $CM* [$SP $ZW];"
</span><span class="cx"> "$CM+ [$SP $ZW];"
</span><del>- "[$EmojiForModsAndSeqs $EmojiMods] $ZWJ $EmojiForModsAndSeqs;"
</del><ins>+ "$EmojiForSeqs $EmojiVar? $EmojiMods? $ZWJ $EmojiForSeqs;"
</ins><span class="cx"> "$CAN_CM $CM+;"
</span><span class="cx"> "$CM+;"
</span><span class="cx"> "$CAN_CM $CM* $WJcm;"
</span><span class="lines">@@ -553,7 +557,7 @@
</span><span class="cx"> "($ALcm | $HLcm | $NUcm) $OPcm;"
</span><span class="cx"> "$CM+ $OPcm;"
</span><span class="cx"> "$CPcm ($ALcm | $HLcm | $NUcm);"
</span><del>- "[$EmojiForModsAndSeqs $EmojiForModsOnly] $EmojiMods;";
</del><ins>+ "$EmojiForMods $EmojiVar? $EmojiMods;";
</ins><span class="cx">
</span><span class="cx"> static const char* uax14Reverse =
</span><span class="cx"> "!!reverse;"
</span><span class="lines">@@ -591,7 +595,7 @@
</span><span class="cx"> "$LF $CR;"
</span><span class="cx"> "[$SP $ZW] [$LB4NonBreaks-$CM];"
</span><span class="cx"> "[$SP $ZW] $CM+ $CAN_CM;"
</span><del>- "$EmojiForModsAndSeqs $ZWJ [$EmojiForModsAndSeqs $EmojiMods];"
</del><ins>+ "$EmojiForSeqs $ZWJ $EmojiMods? $EmojiVar? $EmojiForSeqs;"
</ins><span class="cx"> "$CM+ $CAN_CM;"
</span><span class="cx"> "$CM* $WJ $CM* $CAN_CM;"
</span><span class="cx"> "$CM* $WJ [$LB8NonBreaks-$CM];"
</span><span class="lines">@@ -649,7 +653,7 @@
</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>- "$EmojiMods [$EmojiForModsAndSeqs $EmojiForModsOnly];";
</del><ins>+ "$EmojiMods $EmojiVar? $EmojiForMods;";
</ins><span class="cx">
</span><span class="cx"> static const char* uax14SafeForward =
</span><span class="cx"> "!!safe_forward;"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (180086 => 180087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2015-02-13 23:27:16 UTC (rev 180086)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2015-02-13 23:44:02 UTC (rev 180087)
</span><span class="lines">@@ -1440,7 +1440,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;
</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>
</div>
</body>
</html>