Title: [189320] branches/safari-601-branch
- Revision
- 189320
- Author
- [email protected]
- Date
- 2015-09-03 16:44:51 -0700 (Thu, 03 Sep 2015)
Log Message
Merged r189167. rdar://problem/22541321
Modified Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (189319 => 189320)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-03 23:43:42 UTC (rev 189319)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-03 23:44:51 UTC (rev 189320)
@@ -1,5 +1,23 @@
2015-09-03 Babak Shafiei <[email protected]>
+ Merge r189167.
+
+ 2015-08-31 Enrica Casucci <[email protected]>
+
+ Incorrect cursor movement for U+26F9, U+1F3CB with variations.
+ https://bugs.webkit.org/show_bug.cgi?id=148629
+ rdar://problem/22492366
+
+ Reviewed by Ryosuke Niwa.
+
+ The test has been updated to test these two emoji and to
+ cover the cursor movement as well.
+
+ * editing/deleting/delete-emoji-expected.txt:
+ * editing/deleting/delete-emoji.html:
+
+2015-09-03 Babak Shafiei <[email protected]>
+
Merge r189046.
2015-08-27 Basile Clement <[email protected]>
Modified: branches/safari-601-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt (189319 => 189320)
--- branches/safari-601-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-09-03 23:43:42 UTC (rev 189319)
+++ branches/safari-601-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-09-03 23:44:51 UTC (rev 189320)
@@ -1,65 +1,59 @@
-This test verifies that emoji groups and emoji with variations are deleted correctly
+This test verifies that deletions are correct over emoji groups and emoji with variations
Dump of markup 1:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎππΎπβπ¨<#selection-caret>
+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπβπ¨ππΎ<#selection-caret>
"
Dump of markup 2:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎππΎ<#selection-caret>"
+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπβπ¨<#selection-caret>"
Dump of markup 3:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎ<#selection-caret>"
-
-Dump of markup 4:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎ<#selection-caret>"
-
-Dump of markup 5:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎ<#selection-caret>"
-Dump of markup 6:
+Dump of markup 4:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎ<#selection-caret>"
-Dump of markup 7:
+Dump of markup 5:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎ<#selection-caret>"
-Dump of markup 8:
+Dump of markup 6:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎ<#selection-caret>"
-Dump of markup 9:
+Dump of markup 7:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎ<#selection-caret>"
-Dump of markup 10:
+Dump of markup 8:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»<#selection-caret>"
-Dump of markup 11:
+Dump of markup 9:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨<#selection-caret>"
-Dump of markup 12:
+Dump of markup 10:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©<#selection-caret>"
-Dump of markup 13:
+Dump of markup 11:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨<#selection-caret>"
-Dump of markup 14:
+Dump of markup 12:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©<#selection-caret>"
-Dump of markup 15:
+Dump of markup 13:
| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦<#selection-caret>"
-Dump of markup 16:
+Dump of markup 14:
| "π¦π»π¦πΎπ»π¦πΎπ¦<#selection-caret>"
-Dump of markup 17:
+Dump of markup 15:
| "π¦π»π¦πΎπ»π¦πΎ<#selection-caret>"
-Dump of markup 18:
+Dump of markup 16:
| "π¦π»π¦πΎπ»<#selection-caret>"
-Dump of markup 19:
+Dump of markup 17:
| "π¦π»π¦πΎ<#selection-caret>"
-Dump of markup 20:
+Dump of markup 18:
| "π¦π»<#selection-caret>"
-Dump of markup 21:
+Dump of markup 19:
| <br>
Modified: branches/safari-601-branch/LayoutTests/editing/deleting/delete-emoji.html (189319 => 189320)
--- branches/safari-601-branch/LayoutTests/editing/deleting/delete-emoji.html 2015-09-03 23:43:42 UTC (rev 189319)
+++ branches/safari-601-branch/LayoutTests/editing/deleting/delete-emoji.html 2015-09-03 23:44:51 UTC (rev 189320)
@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html>
<body>
-<div id="test" contenteditable="true">👦🏻👦🏾🏻👦🏾👦👩‍👩‍👦👩‍❤️‍👩👨‍❤️‍👨👩‍❤️‍💋‍👩👨‍❤️‍💋‍👨☝️🏻✍🏾⛹🏾🖐🏾🖕🏾🤘🏾🕵🏾🕴🏾🏋🏾👁‍🗨
+<div id="test" contenteditable="true">👦🏻👦🏾🏻👦🏾👦👩‍👩‍👦👩‍❤️‍👩👨‍❤️‍👨👩‍❤️‍💋‍👩👨‍❤️‍💋‍👨☝️🏻✍🏾⛹🏾🖐🏾🖕🏾🤘🏾👁‍🗨🏋🏾
</div>
<script src=""
<script>
-Markup.description("This test verifies that emoji groups and emoji with variations are deleted correctly");
+Markup.description("This test verifies that deletions are correct over emoji groups and emoji with variations");
var testElement = document.getElementById('test');
getSelection().setBaseAndExtent(testElement.firstChild, testElement.firstChild.length, testElement.firstChild, testElement.firstChild.length);
Markup.dump("test");
@@ -13,6 +13,7 @@
document.execCommand("Delete");
Markup.dump("test");
}
+
</script>
</body>
</html>
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (189319 => 189320)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-03 23:43:42 UTC (rev 189319)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-03 23:44:51 UTC (rev 189320)
@@ -1,5 +1,22 @@
2015-09-03 Babak Shafiei <[email protected]>
+ Merge r189167.
+
+ 2015-08-31 Enrica Casucci <[email protected]>
+
+ Incorrect cursor movement for U+26F9, U+1F3CB with variations.
+ https://bugs.webkit.org/show_bug.cgi?id=148629
+ rdar://problem/22492366
+
+ Reviewed by Ryosuke Niwa.
+
+ Updating text break iterator rules to correctly handle those two emoji with variations.
+
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::cursorMovementIterator):
+
+2015-09-03 Babak Shafiei <[email protected]>
+
Merge r189101.
2015-08-28 Brady Eidson <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (189319 => 189320)
--- branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-09-03 23:43:42 UTC (rev 189319)
+++ branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-09-03 23:44:51 UTC (rev 189320)
@@ -214,7 +214,7 @@
"$EmojiVar = [\\uFE0F];" // Emoji-style variation selector
#if ADDITIONAL_EMOJI_SUPPORT
"$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];" // Emoji that participate in ZWJ sequences
- "$EmojiForMods = [\\u261D \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
+ "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
#else
"$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 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
@@ -447,7 +447,7 @@
"$EmojiVar = \\uFE0F;"
#if ADDITIONAL_EMOJI_SUPPORT
"$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];"
- "$EmojiForMods = [\\u261D \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
+ "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
#else
"$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 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
