<!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>[180458] branches/safari-600.5-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/180458">180458</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 14:40:21 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/179567">r179567</a>. rdar://problem/19850762</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformtextTextBreakIteratorcpp">branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180457 => 180458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-20 22:28:23 UTC (rev 180457)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-20 22:40:21 UTC (rev 180458)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-02-20 Dana Burkart <dburkart@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-20 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176473.
</span><span class="cx">
</span><span class="cx"> 2014-11-21 Glenn Adams <glenn@skynav.com> and Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180457 => 180458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-20 22:28:23 UTC (rev 180457)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-20 22:40:21 UTC (rev 180458)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-02-20 Dana Burkart <dburkart@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.
+
+ 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):
+
+2015-02-20 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176473.
</span><span class="cx">
</span><span class="cx"> * rendering/SimpleLineLayout.cpp:
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (180457 => 180458)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-02-20 22:28:23 UTC (rev 180457)
+++ branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-02-20 22:40:21 UTC (rev 180458)
</span><span class="lines">@@ -405,6 +405,10 @@
</span><span class="cx"> "$WJ = [:LineBreak = Word_Joiner:];"
</span><span class="cx"> "$XX = [:LineBreak = Unknown:];"
</span><span class="cx"> "$ZW = [:LineBreak = ZWSpace:];"
</span><ins>+ "$ZWJ = \\u200D;"
+ "$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];"
+ "$EmojiMods = [\\U0001F3FB-\\U0001F3FF];"
</ins><span class="cx"> "$dictionary = [:LineBreak = Complex_Context:];"
</span><span class="cx"> "$ALPlus = [$AL $AI $SA $SG $XX];"
</span><span class="cx"> "$ALcm = $ALPlus $CM*;"
</span><span class="lines">@@ -481,6 +485,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><ins>+ "[$EmojiForModsAndSeqs $EmojiMods] $ZWJ $EmojiForModsAndSeqs;"
</ins><span class="cx"> "$CAN_CM $CM+;"
</span><span class="cx"> "$CM+;"
</span><span class="cx"> "$CAN_CM $CM* $WJcm;"
</span><span class="lines">@@ -547,7 +552,8 @@
</span><span class="cx"> "$IScm ($ALcm | $HLcm);"
</span><span class="cx"> "($ALcm | $HLcm | $NUcm) $OPcm;"
</span><span class="cx"> "$CM+ $OPcm;"
</span><del>- "$CPcm ($ALcm | $HLcm | $NUcm);";
</del><ins>+ "$CPcm ($ALcm | $HLcm | $NUcm);"
+ "[$EmojiForModsAndSeqs $EmojiForModsOnly] $EmojiMods;";
</ins><span class="cx">
</span><span class="cx"> static const char* uax14Reverse =
</span><span class="cx"> "!!reverse;"
</span><span class="lines">@@ -585,6 +591,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><ins>+ "$EmojiForModsAndSeqs $ZWJ [$EmojiForModsAndSeqs $EmojiMods];"
</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">@@ -641,7 +648,8 @@
</span><span class="cx"> "$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);"
</span><span class="cx"> "$CM* ($ALPlus | $HL) $CM* $IS;"
</span><span class="cx"> "$CM* $OP $CM* ($ALPlus | $HL | $NU);"
</span><del>- "$CM* ($ALPlus | $HL | $NU) $CM* $CP;";
</del><ins>+ "$CM* ($ALPlus | $HL | $NU) $CM* $CP;"
+ "$EmojiMods [$EmojiForModsAndSeqs $EmojiForModsOnly];";
</ins><span class="cx">
</span><span class="cx"> static const char* uax14SafeForward =
</span><span class="cx"> "!!safe_forward;"
</span></span></pre>
</div>
</div>
</body>
</html>