<!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>[179711] branches/safari-600.1.4.15-branch</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/179711">179711</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-05 14:35:48 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/179567">r179567</a>. rdar://problem/19432892</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsFontcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformtextTextBreakIteratorcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderTextcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestseditingdeletingdeleteemojiexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestseditingdeletingdeleteemojihtml">branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179710 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-05 22:34:13 UTC (rev 179710)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-02-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179567
+
+ 2015-02-02 Enrica Casucci <enrica@apple.com>
+
+ Additional emoji support.
+ https://bugs.webkit.org/show_bug.cgi?id=141047
+ rdar://problem/19045135
+
+ Reviewed by Darin Adler.
+
+ * editing/deleting/delete-emoji.html: Added.
+ * editing/deleting/delete-emoji-expected.txt: Added.
+
+2015-02-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r178953
</span><span class="cx">
</span><span class="cx"> 2015-01-21 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestseditingdeletingdeleteemojiexpectedtxtfromrev179567trunkLayoutTestseditingdeletingdeleteemojiexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt (from rev 179567, trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt) (0 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+This test verifies that emoji groups and emoji with variations are deleted correctly
+
+Dump of markup 1:
+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦<#selection-caret>
+"
+
+Dump of markup 2:
+| "π¦π»π¦πΎπ»π¦πΎπ¦<#selection-caret>"
+
+Dump of markup 3:
+| "π¦π»π¦πΎπ»π¦πΎ<#selection-caret>"
+
+Dump of markup 4:
+| "π¦π»π¦πΎπ»<#selection-caret>"
+
+Dump of markup 5:
+| "π¦π»π¦πΎ<#selection-caret>"
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestseditingdeletingdeleteemojihtmlfromrev179567trunkLayoutTestseditingdeletingdeleteemojihtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html (from rev 179567, trunk/LayoutTests/editing/deleting/delete-emoji.html) (0 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<div id="test" contenteditable="true">&#x1F466;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F466;&#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;
+</div>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+Markup.description("This test verifies that emoji groups and emoji with variations are deleted correctly");
+
+var selection = window.getSelection();
+var testElement = document.getElementById('test');
+selection.setBaseAndExtent(testElement.firstChild, 20, testElement.firstChild, 20);
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
+document.execCommand("Delete");
+Markup.dump("test");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179710 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-05 22:34:13 UTC (rev 179710)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-02-05 Lucas Forschler <lforschler@apple.com>
+
+ Merge r179567
+
+ 2015-02-02 Enrica Casucci <enrica@apple.com>
+
+ Additional emoji support.
+ https://bugs.webkit.org/show_bug.cgi?id=141047
+ rdar://problem/19045135
+
+ Reviewed by Darin Adler.
+
+ Adds support for emoji modifiers and group emoji.
+
+ Test: editing/deleting/delete-emoji.html
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::characterRangeCodePath):
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::cursorMovementIterator):
+ * rendering/RenderText.cpp:
+ (WebCore::isEmojiGroupCandidate):
+ (WebCore::isEmojiModifier):
+ (WebCore::RenderText::previousOffsetForBackwardDeletion):
+
</ins><span class="cx"> 2015-02-04 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178661
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp (179710 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp 2015-02-05 22:34:13 UTC (rev 179710)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -620,8 +620,13 @@
</span><span class="cx"> // Alternatively, we may as well consider binary search over a sorted
</span><span class="cx"> // list of ranges.
</span><span class="cx"> CodePath result = Simple;
</span><ins>+ bool previousCharacterIsEmojiGroupCandidate = false;
</ins><span class="cx"> for (unsigned i = 0; i < len; i++) {
</span><span class="cx"> const UChar c = characters[i];
</span><ins>+ if (c == zeroWidthJoiner && previousCharacterIsEmojiGroupCandidate)
+ return Complex;
+
+ previousCharacterIsEmojiGroupCandidate = false;
</ins><span class="cx"> if (c < 0x2E5) // U+02E5 through U+02E9 (Modifier Letters : Tone letters)
</span><span class="cx"> continue;
</span><span class="cx"> if (c <= 0x2E9)
</span><span class="lines">@@ -741,7 +746,11 @@
</span><span class="cx"> continue;
</span><span class="cx"> if (supplementaryCharacter <= 0x1F1FF)
</span><span class="cx"> return Complex;
</span><del>-
</del><ins>+
+ if (supplementaryCharacter >= 0x1F466 && supplementaryCharacter <= 0x1F469) {
+ previousCharacterIsEmojiGroupCandidate = true;
+ continue;
+ }
</ins><span class="cx"> if (supplementaryCharacter < 0xE0100) // U+E0100 through U+E01EF Unicode variation selectors.
</span><span class="cx"> continue;
</span><span class="cx"> if (supplementaryCharacter <= 0xE01EF)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (179710 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-02-05 22:34:13 UTC (rev 179710)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -207,6 +207,10 @@
</span><span class="cx"> "$MalV = \\u0D4D;" // Malayalam Sign Virama
</span><span class="cx"> "$Mal1 = [\\u0D15-\\u0D39];" // Malayalam Letter A,...,Ha
</span><span class="cx"> "$RI = [\\U0001F1E6-\\U0001F1FF];" // Emoji regional indicators
</span><ins>+ "$ZWJ = \\u200D;" // Zero width joiner
+ "$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
+ "$EmojiMods = [\\U0001F3FB-\\U0001F3FF];" // Fitzpatrick modifiers
</ins><span class="cx"> "!!chain;"
</span><span class="cx"> "!!forward;"
</span><span class="cx"> "$CR $LF;"
</span><span class="lines">@@ -225,6 +229,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><ins>+ "$ZWJ $EmojiForModsAndSeqs;" // Don't break in emoji ZWJ sequences
+ "[$EmojiForModsAndSeqs $EmojiForModsOnly] $EmojiMods;" // Don't break between relevant emoji 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">@@ -242,6 +248,8 @@
</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><ins>+ "$EmojiForModsAndSeqs $ZWJ;" // Don't break in emoji ZWJ sequences
+ "$EmojiMods [$EmojiForModsAndSeqs $EmojiForModsOnly];" // Don't break between relevant emoji and Fitzpatrick modifier
</ins><span class="cx"> "!!safe_reverse;"
</span><span class="cx"> "!!safe_forward;";
</span><span class="cx"> static TextBreakIterator* staticCursorMovementIterator = initializeIteratorWithRules(kRules);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp (179710 => 179711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-02-05 22:34:13 UTC (rev 179710)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-02-05 22:35:48 UTC (rev 179711)
</span><span class="lines">@@ -1380,23 +1380,33 @@
</span><span class="cx"> HangulStateBreak
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool isHangulLVT(UChar32 character)
</del><ins>+static inline bool isHangulLVT(UChar32 character)
</ins><span class="cx"> {
</span><span class="cx"> return (character - HANGUL_SYLLABLE_START) % HANGUL_JONGSEONG_COUNT;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isMark(UChar32 c)
</del><ins>+static inline bool isMark(UChar32 character)
</ins><span class="cx"> {
</span><del>- int8_t charType = u_charType(c);
</del><ins>+ int8_t charType = u_charType(character);
</ins><span class="cx"> return charType == U_NON_SPACING_MARK || charType == U_ENCLOSING_MARK || charType == U_COMBINING_SPACING_MARK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isRegionalIndicator(UChar32 c)
</del><ins>+static inline bool isRegionalIndicator(UChar32 character)
</ins><span class="cx"> {
</span><span class="cx"> // National flag emoji each consists of a pair of regional indicator symbols.
</span><del>- return 0x1F1E6 <= c && c <= 0x1F1FF;
</del><ins>+ return 0x1F1E6 <= character && character <= 0x1F1FF;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool isEmojiGroupCandidate(UChar32 character)
+{
+ return character >= 0x1F466 && character <= 0x1F469;
+}
+
+static inline bool isEmojiModifier(UChar32 character)
+{
+ return character >= 0x1F3FB && character <= 0x1F3FF;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int RenderText::previousOffsetForBackwardDeletion(int current) const
</span><span class="lines">@@ -1406,6 +1416,9 @@
</span><span class="cx"> StringImpl& text = *m_text.impl();
</span><span class="cx"> UChar32 character;
</span><span class="cx"> bool sawRegionalIndicator = false;
</span><ins>+ bool sawEmojiGroupCandidate = false;
+ bool sawEmojiModifier = false;
+
</ins><span class="cx"> while (current > 0) {
</span><span class="cx"> if (U16_IS_TRAIL(text[--current]))
</span><span class="cx"> --current;
</span><span class="lines">@@ -1414,6 +1427,22 @@
</span><span class="cx">
</span><span class="cx"> UChar32 character = text.characterStartingAt(current);
</span><span class="cx">
</span><ins>+ if (sawEmojiGroupCandidate) {
+ sawEmojiGroupCandidate = false;
+ if (character == zeroWidthJoiner)
+ continue;
+ // We could have two emoji group candidates without a joiner in between.
+ // Those should not be treated as a group.
+ U16_FWD_1_UNSAFE(text, current);
+ break;
+ }
+
+ if (sawEmojiModifier) {
+ if (isEmojiModifier(character))
+ U16_FWD_1_UNSAFE(text, current);
+ break;
+ }
+
</ins><span class="cx"> if (sawRegionalIndicator) {
</span><span class="cx"> // We don't check if the pair of regional indicator symbols before current position can actually be combined
</span><span class="cx"> // into a flag, and just delete it. This may not agree with how the pair is rendered in edge cases,
</span><span class="lines">@@ -1432,7 +1461,17 @@
</span><span class="cx"> sawRegionalIndicator = true;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+
+ if (isEmojiModifier(character)) {
+ sawEmojiModifier = true;
+ continue;
+ }
</ins><span class="cx">
</span><ins>+ if (isEmojiGroupCandidate(character)) {
+ sawEmojiGroupCandidate = true;
+ continue;
+ }
+
</ins><span class="cx"> if (!isMark(character) && (character != 0xFF9E) && (character != 0xFF9F))
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>