Changeset 25251 in webkit

Timestamp:

Aug 25, 2007, 7:16:42 PM (18 years ago)

Author:

oliver

Message:

Reviewed by Adam and Sam

<rdar://problem/5269732> Safari 3.0 for Windows cuts off text in textarea boxes during sending forms (14562)
<​http://bugs.webkit.org/show_bug.cgi?id=14562> [Win] Textarea contents partially eaten on submit/copy

WebView::handleEditingKeyboardEvent assumed all keycodes that did not trigger a named command were
to be inserted. This could cause unexpected behaviour when control characters (eg. escape) are sent,
or could cause data loss when sent a null character (as happens when dead keys are used for international
input).

This patch corrects WebView::handleEditingKeyboardEvent to prevent such characters from being sent
to Editor::insertText. This behaviour matches Firefox.

• WebView.cpp: (WebView::handleEditingKeyboardEvent):

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2007-08-25  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Adam and Sam
+        
+        <rdar://problem/5269732> Safari 3.0 for Windows cuts off text in textarea boxes during sending forms (14562) 
+        <http://bugs.webkit.org/show_bug.cgi?id=14562> [Win] Textarea contents partially eaten on submit/copy
+        
+        WebView::handleEditingKeyboardEvent assumed all keycodes that did not trigger a named command were
+        to be inserted.  This could cause unexpected behaviour when control characters (eg. escape) are sent,
+        or could cause data loss when sent a null character (as happens when dead keys are used for international 
+        input).
+        
+        This patch corrects WebView::handleEditingKeyboardEvent to prevent such characters from being sent 
+        to Editor::insertText.  This behaviour matches Firefox.
+
+        * WebView.cpp:
+        (WebView::handleEditingKeyboardEvent):
+
 2007-08-24  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit/win/WebView.cpp

@@ -987 +987 @@
             return true;
 
-    if (evt->keyEvent())
-        if (frame->editor()->insertText(evt->keyEvent()->text(), evt))
-            return true;
-
-    return false;
+    if (!evt->keyEvent())
+        return false;
+
+    if (evt->keyEvent()->text().length() == 1) {
+        UChar ch = evt->keyEvent()->text()[0];
+        // Don't insert null or control characters as they can reslt in unexpected behaviour
+        if (ch < ' ')
+            return false;
+    }
+
+    return frame->editor()->insertText(evt->keyEvent()->text(), evt);
 }