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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 57d048b1130fb025098102173535b59c34054227..7145ec332c3658e7d656cf3497925fe2f49816f3 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,21 @@
+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>
 
         Revert r25216 which renamed the COM DOM bindings to use Deprecated prefix.

diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index a56c1041af5c91c0c7e18b2c76648d677c041f2a..7aef477585cb45c6caa737d91b354d828337ea8d 100644 (file)
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -986,11 +986,17 @@ bool WebView::handleEditingKeyboardEvent(KeyboardEvent* evt)
         if (frame->editor()->execCommand(command, evt))
             return true;
 
-    if (evt->keyEvent())
-        if (frame->editor()->insertText(evt->keyEvent()->text(), evt))
-            return true;
+    if (!evt->keyEvent())
+        return false;
 
-    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);
 }
 
 bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData)