Changeset 93068 in webkit

Timestamp:

Aug 15, 2011, 4:34:29 PM (15 years ago)

Author:

ap@apple.com

Message:

Regional indicator symbols that are combined should behave as a single character when editing
​https://bugs.webkit.org/show_bug.cgi?id=65395

Reviewed by Dan Bernstein.

Part one: make backspace work.

Test: editing/deleting/regional-indicators.html

• rendering/RenderText.cpp: (WebCore::isRegionalIndicator): (WebCore::RenderText::previousOffsetForBackwardDeletion): Added a special case for regional indicator symbols.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/delete-3928305-fix.html (modified) (1 diff)
• LayoutTests/editing/deleting/regional-indicators-expected.txt (added)
• LayoutTests/editing/deleting/regional-indicators.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderText.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-15  Alexey Proskuryakov  <ap@apple.com>
+
+        Regional indicator symbols that are combined should behave as a single character when editing
+        https://bugs.webkit.org/show_bug.cgi?id=65395
+
+        Reviewed by Dan Bernstein.
+
+        * editing/deleting/regional-indicators-expected.txt: Added.
+        * editing/deleting/regional-indicators.html: Added.
+
 2011-08-15  Chris Rogers  <crogers@google.com>
 

trunk/LayoutTests/editing/deleting/delete-3928305-fix.html

@@ -14 +14 @@
 <script>
 
-function editingTest() {
+function editisngTest() {
     for (i = 0; i < 4; i++)
         moveSelectionForwardByCharacterCommand(); 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-15  Alexey Proskuryakov  <ap@apple.com>
+
+        Regional indicator symbols that are combined should behave as a single character when editing
+        https://bugs.webkit.org/show_bug.cgi?id=65395
+
+        Reviewed by Dan Bernstein.
+
+        Part one: make backspace work.
+
+        Test: editing/deleting/regional-indicators.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::isRegionalIndicator):
+        (WebCore::RenderText::previousOffsetForBackwardDeletion): Added a special case for regional
+        indicator symbols.
+
 2011-08-15  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1500 +1500 @@
 }
 
+inline bool isRegionalIndicator(UChar32 c)
+{
+    // National flag emoji each consists of a pair of regional indicator symbols.
+    return 0x1F1E6 <= c && c <= 0x1F1FF;
+}
+
 #endif
 
@@ -1508 +1514 @@
     StringImpl& text = *m_text.impl();
     UChar32 character;
+    bool sawRegionalIndicator = false;
     while (current > 0) {
         if (U16_IS_TRAIL(text[--current]))
@@ -1516 +1523 @@
         UChar32 character = text.characterStartingAt(current);
 
+        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,
+            // but is good enough in practice.
+            if (isRegionalIndicator(character))
+                break;
+            // Don't delete a preceding character that isn't a regional indicator symbol.
+            U16_FWD_1_UNSAFE(text, current);
+        }
+
         // We don't combine characters in Armenian ... Limbu range for backward deletion.
         if ((character >= 0x0530) && (character < 0x1950))
             break;
+
+        if (isRegionalIndicator(character)) {
+            sawRegionalIndicator = true;
+            continue;
+        }
 
         if (!isMark(character) && (character != 0xFF9E) && (character != 0xFF9F))