Changeset 181351 in webkit

Timestamp:

Mar 10, 2015 4:12:53 PM (9 years ago)

Author:

enrica@apple.com

Message:

Add support for more emoji with variation.
​https://bugs.webkit.org/show_bug.cgi?id=142548
rdar://problem/20105008

Reviewed by Tim Horton.

Source/WebCore:

Update ICU rules to support new emoji with variation.

Test: editing/selection/extend-by-character-007.html

• platform/text/TextBreakIterator.cpp:

(WebCore::cursorMovementIterator):

LayoutTests:

• editing/selection/extend-by-character-007-expected.txt: Added.
• editing/selection/extend-by-character-007.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/editing/selection/extend-by-character-007-expected.txt (added)
• LayoutTests/editing/selection/extend-by-character-007.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/text/TextBreakIterator.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2015-03-10  Eric Carlson  <eric.carlson@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -127 +127 @@
 
 webkit.org/b/141661 fast/text/emoji.html [ Failure ]
+webkit.org/b/142548 editing/selection/extend-by-character-007.html [ Failure ]
 
 webkit.org/b/128736 inspector-protocol/debugger/setBreakpoint-dfg.html [ Failure Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-03-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/text/TextBreakIterator.cpp

@@ -211 +211 @@
         "$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;"
@@ -412 +412 @@
     "$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:];"