[webkit-changes] [179730] branches/safari-600.1.4.15-branch

Thu, 05 Feb 2015 17:16:22 -0800

Title: [179730] branches/safari-600.1.4.15-branch

Diff

Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179729 => 179730)


--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog	2015-02-06 01:15:51 UTC (rev 179730)
@@ -1,5 +1,9 @@
 2015-02-05  Lucas Forschler  <[email protected]>
 
+    Rollout r179711
+
+2015-02-05  Lucas Forschler  <[email protected]>
+
         Merge r179627
 
     2015-02-03  David Hyatt  <[email protected]>

Deleted: branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt (179729 => 179730)


--- branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-02-06 01:15:51 UTC (rev 179730)
@@ -1,17 +0,0 @@
-This test verifies that emoji groups and emoji with variations are deleted correctly
-
-Dump of markup 1:
-| "πŸ‘¦πŸ»πŸ‘¦πŸΎπŸ»πŸ‘¦πŸΎπŸ‘¦πŸ‘©β€πŸ‘©β€πŸ‘¦<#selection-caret>
-"
-
-Dump of markup 2:
-| "πŸ‘¦πŸ»πŸ‘¦πŸΎπŸ»πŸ‘¦πŸΎπŸ‘¦<#selection-caret>"
-
-Dump of markup 3:
-| "πŸ‘¦πŸ»πŸ‘¦πŸΎπŸ»πŸ‘¦πŸΎ<#selection-caret>"
-
-Dump of markup 4:
-| "πŸ‘¦πŸ»πŸ‘¦πŸΎπŸ»<#selection-caret>"
-
-Dump of markup 5:
-| "πŸ‘¦πŸ»πŸ‘¦πŸΎ<#selection-caret>"

Deleted: branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html (179729 => 179730)


--- branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/deleting/delete-emoji.html	2015-02-06 01:15:51 UTC (rev 179730)
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div id="test" contenteditable="true">&#x1F466;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F466;&#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;
-</div>
-<script src=""
-<script>
-Markup.description("This test verifies that emoji groups and emoji with variations are deleted correctly");
-
-var selection = window.getSelection();
-var testElement = document.getElementById('test');
-selection.setBaseAndExtent(testElement.firstChild, 20, testElement.firstChild, 20);
-Markup.dump("test");
-document.execCommand("Delete");
-Markup.dump("test");
-document.execCommand("Delete");
-Markup.dump("test");
-document.execCommand("Delete");
-Markup.dump("test");
-document.execCommand("Delete");
-Markup.dump("test");
-</script>
-</body>
-</html>

Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179729 => 179730)


--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog	2015-02-06 01:15:51 UTC (rev 179730)
@@ -1,5 +1,9 @@
 2015-02-05  Lucas Forschler  <[email protected]>
 
+    Rollout r179711
+
+2015-02-05  Lucas Forschler  <[email protected]>
+
         Merge r179627
 
     2015-02-03  David Hyatt  <[email protected]>

Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp (179729 => 179730)


--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp	2015-02-06 01:15:51 UTC (rev 179730)
@@ -620,13 +620,8 @@
     // Alternatively, we may as well consider binary search over a sorted
     // 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;
         if (c <= 0x2E9) 
@@ -746,11 +741,7 @@
                 continue;
             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;
             if (supplementaryCharacter <= 0xE01EF)

Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (179729 => 179730)


--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp	2015-02-06 01:15:51 UTC (rev 179730)
@@ -207,10 +207,6 @@
         "$MalV    = \\u0D4D;"              // Malayalam Sign Virama
         "$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;"
         "$CR $LF;"
@@ -229,8 +225,6 @@
         "$Tel0 $TelV $Tel1;"               // Telugu Virama (forward)
         "$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;"
         "($L | $V | $LV | $LVT) $L;"
@@ -248,8 +242,6 @@
         "$Tel1 $TelV $Tel0;"               // Telugu Virama (backward)
         "$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;";
     static TextBreakIterator* staticCursorMovementIterator = initializeIteratorWithRules(kRules);

Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp (179729 => 179730)


--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp	2015-02-06 01:14:40 UTC (rev 179729)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp	2015-02-06 01:15:51 UTC (rev 179730)
@@ -1380,33 +1380,23 @@
     HangulStateBreak
 };
 
-static inline bool isHangulLVT(UChar32 character)
+inline bool isHangulLVT(UChar32 character)
 {
     return (character - HANGUL_SYLLABLE_START) % HANGUL_JONGSEONG_COUNT;
 }
 
-static inline bool isMark(UChar32 character)
+inline bool isMark(UChar32 c)
 {
-    int8_t charType = u_charType(character);
+    int8_t charType = u_charType(c);
     return charType == U_NON_SPACING_MARK || charType == U_ENCLOSING_MARK || charType == U_COMBINING_SPACING_MARK;
 }
 
-static inline bool isRegionalIndicator(UChar32 character)
+inline bool isRegionalIndicator(UChar32 c)
 {
     // National flag emoji each consists of a pair of regional indicator symbols.
-    return 0x1F1E6 <= character && character <= 0x1F1FF;
+    return 0x1F1E6 <= c && c <= 0x1F1FF;
 }
 
-static inline bool isEmojiGroupCandidate(UChar32 character)
-{
-    return character >= 0x1F466 && character <= 0x1F469;
-}
-
-static inline bool isEmojiModifier(UChar32 character)
-{
-    return character >= 0x1F3FB && character <= 0x1F3FF;
-}
-
 #endif
 
 int RenderText::previousOffsetForBackwardDeletion(int current) const
@@ -1416,9 +1406,6 @@
     StringImpl& text = *m_text.impl();
     UChar32 character;
     bool sawRegionalIndicator = false;
-    bool sawEmojiGroupCandidate = false;
-    bool sawEmojiModifier = false;
-    
     while (current > 0) {
         if (U16_IS_TRAIL(text[--current]))
             --current;
@@ -1427,22 +1414,6 @@
 
         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) {
             // We don't check if the pair of regional indicator symbols before current position can actually be combined
             // into a flag, and just delete it. This may not agree with how the pair is rendered in edge cases,
@@ -1461,17 +1432,7 @@
             sawRegionalIndicator = true;
             continue;
         }
-        
-        if (isEmojiModifier(character)) {
-            sawEmojiModifier = true;
-            continue;
-        }
 
-        if (isEmojiGroupCandidate(character)) {
-            sawEmojiGroupCandidate = true;
-            continue;
-        }
-
         if (!isMark(character) && (character != 0xFF9E) && (character != 0xFF9F))
             break;
     }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to