<!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>[181402] 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/181402">181402</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-03-11 13:18:59 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/181351">r181351</a>. <rdar://problem/20123022></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6005branchLayoutTestsTestExpectations">branches/safari-600.5-branch/LayoutTests/TestExpectations</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestseditingselectionextendbycharacter007expectedtxt">branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt</a></li>
<li><a href="#branchessafari6005branchLayoutTestseditingselectionextendbycharacter007html">branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html</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 (181401 => 181402)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-03-11 20:08:26 UTC (rev 181401)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-03-11 20:18:59 UTC (rev 181402)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-03-10 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r181351.
+
+ 2015-03-10 Enrica Casucci <enrica@apple.com>
+
+ Add support for more emoji with variation.
+ https://bugs.webkit.org/show_bug.cgi?id=142548
+ rdar://problem/20105008
+
+ Reviewed by Tim Horton.
+
+ * editing/selection/extend-by-character-007-expected.txt: Added.
+ * editing/selection/extend-by-character-007.html: Added.
+
</ins><span class="cx"> 2015-03-04 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when accessing an item in SVGTransformList and then removing a previous item from this list.
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/TestExpectations (181401 => 181402)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/TestExpectations 2015-03-11 20:08:26 UTC (rev 181401)
+++ branches/safari-600.5-branch/LayoutTests/TestExpectations 2015-03-11 20:18:59 UTC (rev 181402)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx"> webkit.org/b/134769 fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/141661 fast/text/emoji.html [ Failure ]
</span><ins>+webkit.org/b/142548 editing/selection/extend-by-character-007.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> compositing/fixed-image-loading.html [ Skip ]
</span><span class="cx"> fast/xsl/xslt-missing-namespace-in-xslt.xml [ Skip ]
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestseditingselectionextendbycharacter007expectedtxtfromrev181351trunkLayoutTestseditingselectionextendbycharacter007expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007-expected.txt) (0 => 181402)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt 2015-03-11 20:18:59 UTC (rev 181402)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 4 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+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 {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 275x28
+ RenderText {#text} at (14,16) size 275x28
+ text run at (14,16) width 275: "\x{D83D}\x{DEA3}\x{D83C}\x{DFFB}\x{D83D}\x{DEA3}\x{D83C}\x{DFFC}\x{D83D}\x{DEA3}\x{D83C}\x{DFFD}\x{D83D}\x{DEA3}\x{D83C}\x{DFFE}\x{D83D}\x{DEA3}\x{D83C}\x{DFFF}\x{D83D}\x{DEA3}"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body
+selection end: position 16 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body
</ins></span></pre></div>
<a id="branchessafari6005branchLayoutTestseditingselectionextendbycharacter007htmlfromrev181351trunkLayoutTestseditingselectionextendbycharacter007html"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007.html) (0 => 181402)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html 2015-03-11 20:18:59 UTC (rev 181402)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<html>
+<head>
+
+<style>
+.editing {
+ border: 2px solid red;
+ padding: 12px;
+ font-size: 24px;
+}
+</style>
+<script src="../editing.js"></script>
+
+<script>
+
+function editingTest() {
+ for (var i = 0; i < 4; i++) {
+ extendSelectionForwardByCharacterCommand();
+ }
+}
+
+</script>
+
+<title>Editing Test</title>
+</head>
+<body>
+<!-- rdar://problem/20105008 //-->
+<div contenteditable id="root" class="editing">
+<span id="test">&#x1F6A3;&#x1F3FB;&#x1F6A3;&#x1F3FC;&#x1F6A3;&#x1F3FD;&#x1F6A3;&#x1F3FE;&#x1F6A3;&#x1F3FF;&#x1F6A3;</span>
+
+<script>
+runEditingTest();
+</script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (181401 => 181402)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-03-11 20:08:26 UTC (rev 181401)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-03-11 20:18:59 UTC (rev 181402)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-03-10 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r181351.
+
+ 2015-03-10 Enrica Casucci <enrica@apple.com>
+
+ Add support for more emoji with variation.
+ https://bugs.webkit.org/show_bug.cgi?id=142548
+ rdar://problem/20105008
+
+ Reviewed by Tim Horton.
+
+ Update ICU rules to support new emoji with variation.
+
+ Test: editing/selection/extend-by-character-007.html
+
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::cursorMovementIterator):
+
</ins><span class="cx"> 2015-03-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r179958.
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (181401 => 181402)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-03-11 20:08:26 UTC (rev 181401)
+++ branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-03-11 20:18:59 UTC (rev 181402)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> "$ZWJ = \\u200D;" // Zero width joiner
</span><span class="cx"> "$EmojiVar = [\\uFE0F];" // Emoji-style variation selector
</span><span class="cx"> "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];" // Emoji that participate in ZWJ sequences
</span><del>- "$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
</del><ins>+ "$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><span class="cx"> "!!forward;"
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> "$ZWJ = \\u200D;"
</span><span class="cx"> "$EmojiVar = \\uFE0F;"
</span><span class="cx"> "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];"
</span><del>- "$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];"
</del><ins>+ "$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></pre>
</div>
</div>
</body>
</html>