Title: [181406] branches/safari-600.1.4.15-branch
- Revision
- 181406
- Author
- bshaf...@apple.com
- Date
- 2015-03-11 14:14:27 -0700 (Wed, 11 Mar 2015)
Log Message
Merged r181351. rdar://problem/20123049
Modified Paths
Added Paths
Diff
Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (181405 => 181406)
--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-03-11 21:08:51 UTC (rev 181405)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-03-11 21:14:27 UTC (rev 181406)
@@ -1,3 +1,18 @@
+2015-03-11 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r181351.
+
+ 2015-03-10 Enrica Casucci <enr...@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.
+
2015-03-06 Lucas Forschler <lforsch...@apple.com>
Merge r180337
Modified: branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations (181405 => 181406)
--- branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations 2015-03-11 21:08:51 UTC (rev 181405)
+++ branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations 2015-03-11 21:14:27 UTC (rev 181406)
@@ -132,6 +132,7 @@
webkit.org/b/134769 fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html [ Skip ]
webkit.org/b/141661 fast/text/emoji.html [ Failure ]
+webkit.org/b/142548 editing/selection/extend-by-character-007.html [ Failure ]
# border painting diff (Path vs. drawLine)
webkit.org/b/136078 fast/borders/border-painting-dashed.html [ ImageOnlyFailure ]
Copied: branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007-expected.txt) (0 => 181406)
--- branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt 2015-03-11 21:14:27 UTC (rev 181406)
@@ -0,0 +1,20 @@
+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
Copied: branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007.html) (0 => 181406)
--- branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html 2015-03-11 21:14:27 UTC (rev 181406)
@@ -0,0 +1,35 @@
+<html>
+<head>
+
+<style>
+.editing {
+ border: 2px solid red;
+ padding: 12px;
+ font-size: 24px;
+}
+</style>
+<script src=""
+
+<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">🚣🏻🚣🏼🚣🏽🚣🏾🚣🏿🚣</span>
+
+<script>
+runEditingTest();
+</script>
+
+</body>
+</html>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (181405 => 181406)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-11 21:08:51 UTC (rev 181405)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-11 21:14:27 UTC (rev 181406)
@@ -1,3 +1,22 @@
+2015-03-11 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r181351.
+
+ 2015-03-10 Enrica Casucci <enr...@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):
+
2015-03-10 Babak Shafiei <bshaf...@apple.com>
Merge r181123.
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (181405 => 181406)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-03-11 21:08:51 UTC (rev 181405)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-03-11 21:14:27 UTC (rev 181406)
@@ -210,7 +210,7 @@
"$ZWJ = \\u200D;" // Zero width joiner
"$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
+ "$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
"$EmojiMods = [\\U0001F3FB-\\U0001F3FF];" // Fitzpatrick modifiers
"!!chain;"
"!!forward;"
@@ -411,7 +411,7 @@
"$ZWJ = \\u200D;"
"$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];"
+ "$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
"$EmojiMods = [\\U0001F3FB-\\U0001F3FF];"
"$dictionary = [:LineBreak = Complex_Context:];"
"$ALPlus = [$AL $AI $SA $SG $XX];"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
