Changeset 94947 in webkit

Timestamp:

Sep 12, 2011 12:14:38 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Characters beyond U+10000 should be deleted by one pressing delete key.
​https://bugs.webkit.org/show_bug.cgi?id=40351

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-09-12
Reviewed by Kent Tamura.

Source/WebCore:

If a character is the trail part of unicode surrogate pair, the lead part of it
should also be deleted. Also, If in MacOSX, the deletion should honor Mac's behavior.

Test: editing/deleting/delete-surrogatepair.html

• rendering/RenderText.cpp:

(WebCore::RenderText::previousOffsetForBackwardDeletion):

Added if-macro to support chromium on mac, and added trail part check for unicode character.

LayoutTests:

Added deletion tests.

• editing/deleting/delete-surrogatepair-expected.txt: Added.
• editing/deleting/delete-surrogatepair.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff, 1 prop)
• LayoutTests/editing/deleting/delete-surrogatepair-expected.txt (added)
• LayoutTests/editing/deleting/delete-surrogatepair.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff, 1 prop)
• Source/WebCore/rendering/RenderText.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-12  Shinya Kawanaka  <shinyak@google.com>
+
+        Characters beyond U+10000 should be deleted by one pressing delete key.
+        https://bugs.webkit.org/show_bug.cgi?id=40351
+
+        Reviewed by Kent Tamura.
+
+        Added deletion tests.
+
+        * editing/deleting/delete-surrogatepair-expected.txt: Added.
+        * editing/deleting/delete-surrogatepair.html: Added.
+
 2011-09-11  Kentaro Hara  <haraken@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-12  Shinya Kawanaka  <shinyak@google.com>
+
+        Characters beyond U+10000 should be deleted by one pressing delete key.
+        https://bugs.webkit.org/show_bug.cgi?id=40351
+
+        Reviewed by Kent Tamura.
+
+        If a character is the trail part of unicode surrogate pair, the lead part of it
+        should also be deleted. Also, If in MacOSX, the deletion should honor Mac's behavior.
+
+        Test: editing/deleting/delete-surrogatepair.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::previousOffsetForBackwardDeletion):
+          Added if-macro to support chromium on mac, and added trail part check for unicode character.
+
 2011-09-11  Kentaro Hara  <haraken@google.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1627 +1627 @@
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM) && OS(MAC_OS_X)
 
 #define HANGUL_CHOSEONG_START (0x1100)
@@ -1669 +1669 @@
 int RenderText::previousOffsetForBackwardDeletion(int current) const
 {
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM) && OS(MAC_OS_X)
     ASSERT(m_text);
     StringImpl& text = *m_text.impl();
@@ -1757 +1757 @@
 #else
     // Platforms other than Mac delete by one code point.
-    return current - 1;
+    if (U16_IS_TRAIL(m_text[--current]))
+        --current;
+    if (current < 0)
+        current = 0;
+    return current;
 #endif
 }