Changeset 179711 in webkit

Timestamp:

Feb 5, 2015, 2:35:48 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r179567. rdar://problem/19432892

Location:

branches/safari-600.1.4.15-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/delete-emoji-expected.txt (copied) (copied from trunk/LayoutTests/editing/deleting/delete-emoji-expected.txt )
• LayoutTests/editing/deleting/delete-emoji.html (copied) (copied from trunk/LayoutTests/editing/deleting/delete-emoji.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/Font.cpp (modified) (2 diffs)
• Source/WebCore/platform/text/TextBreakIterator.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderText.cpp (modified) (4 diffs)

branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-05  Lucas Forschler  <lforschler@apple.com>
+
+        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-05  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-05  Lucas Forschler  <lforschler@apple.com>
+
+        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-04  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp

@@ -621 +621 @@
     // list of ranges.
     CodePath result = Simple;
+    bool previousCharacterIsEmojiGroupCandidate = false;
     for (unsigned i = 0; i < len; i++) {
         const UChar c = characters[i];
+        if (c == zeroWidthJoiner && previousCharacterIsEmojiGroupCandidate)
+            return Complex;
+
+        previousCharacterIsEmojiGroupCandidate = false;
         if (c < 0x2E5) // U+02E5 through U+02E9 (Modifier Letters : Tone letters)  
             continue;
@@ -742 +747 @@
             if (supplementaryCharacter <= 0x1F1FF)
                 return Complex;
-
+    
+            if (supplementaryCharacter >= 0x1F466 && supplementaryCharacter <= 0x1F469) {
+                previousCharacterIsEmojiGroupCandidate = true;
+                continue;
+            }
             if (supplementaryCharacter < 0xE0100) // U+E0100 through U+E01EF Unicode variation selectors.
                 continue;

branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp

@@ -208 +208 @@
         "$Mal1    = [\\u0D15-\\u0D39];"    // Malayalam Letter A,...,Ha
         "$RI      = [\\U0001F1E6-\\U0001F1FF];" // Emoji regional indicators
+        "$ZWJ     = \\u200D;"               // Zero width joiner
+        "$EmojiForModsAndSeqs = [\\U0001F466-\\U0001F469];" // Emoji that take Fitzpatrick modifiers AND participate in ZWJ sequences
+        "$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];" // Emoji that take Fitzpatrick modifiers
+        "$EmojiMods = [\\U0001F3FB-\\U0001F3FF];" // Fitzpatrick modifiers
         "!!chain;"
         "!!forward;"
@@ -226 +230 @@
         "$Kan0 $KanV $Kan1;"               // Kannada Virama (forward)
         "$Mal0 $MalV $Mal1;"               // Malayalam Virama (forward)
+        "$ZWJ $EmojiForModsAndSeqs;"       // Don't break in emoji ZWJ sequences
+        "[$EmojiForModsAndSeqs $EmojiForModsOnly] $EmojiMods;" // Don't break between relevant emoji and Fitzpatrick modifier
         "!!reverse;"
         "$LF $CR;"
@@ -243 +249 @@
         "$Kan1 $KanV $Kan0;"               // Kannada Virama (backward)
         "$Mal1 $MalV $Mal0;"               // Malayalam Virama (backward)
+        "$EmojiForModsAndSeqs $ZWJ;"       // Don't break in emoji ZWJ sequences
+        "$EmojiMods [$EmojiForModsAndSeqs $EmojiForModsOnly];" // Don't break between relevant emoji and Fitzpatrick modifier
         "!!safe_reverse;"
         "!!safe_forward;";

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp

@@ -1381 +1381 @@
 };
 
-inline bool isHangulLVT(UChar32 character)
+static inline bool isHangulLVT(UChar32 character)
 {
     return (character - HANGUL_SYLLABLE_START) % HANGUL_JONGSEONG_COUNT;
 }
 
-inline bool isMark(UChar32 c)
-{
-    int8_t charType = u_charType(c);
+static inline bool isMark(UChar32 character)
+{
+    int8_t charType = u_charType(character);
     return charType == U_NON_SPACING_MARK || charType == U_ENCLOSING_MARK || charType == U_COMBINING_SPACING_MARK;
 }
 
-inline bool isRegionalIndicator(UChar32 c)
+static inline bool isRegionalIndicator(UChar32 character)
 {
     // National flag emoji each consists of a pair of regional indicator symbols.
-    return 0x1F1E6 <= c && c <= 0x1F1FF;
+    return 0x1F1E6 <= character && character <= 0x1F1FF;
+}
+
+static inline bool isEmojiGroupCandidate(UChar32 character)
+{
+    return character >= 0x1F466 && character <= 0x1F469;
+}
+
+static inline bool isEmojiModifier(UChar32 character)
+{
+    return character >= 0x1F3FB && character <= 0x1F3FF;
 }
 
@@ -1407 +1417 @@
     UChar32 character;
     bool sawRegionalIndicator = false;
+    bool sawEmojiGroupCandidate = false;
+    bool sawEmojiModifier = false;
+    
     while (current > 0) {
         if (U16_IS_TRAIL(text[--current]))
@@ -1414 +1427 @@
 
         UChar32 character = text.characterStartingAt(current);
+
+        if (sawEmojiGroupCandidate) {
+            sawEmojiGroupCandidate = false;
+            if (character == zeroWidthJoiner)
+                continue;
+            // We could have two emoji group candidates without a joiner in between.
+            // Those should not be treated as a group.
+            U16_FWD_1_UNSAFE(text, current);
+            break;
+        }
+
+        if (sawEmojiModifier) {
+            if (isEmojiModifier(character))
+                U16_FWD_1_UNSAFE(text, current);
+            break;
+        }
 
         if (sawRegionalIndicator) {
@@ -1431 +1460 @@
         if (isRegionalIndicator(character)) {
             sawRegionalIndicator = true;
+            continue;
+        }
+        
+        if (isEmojiModifier(character)) {
+            sawEmojiModifier = true;
+            continue;
+        }
+
+        if (isEmojiGroupCandidate(character)) {
+            sawEmojiGroupCandidate = true;
             continue;
         }