[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 426fc1fe32bc379e01c8d2e717cec16fb9872159
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 11 04:49:51 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3506706: REGRESSION (100-115): onkeyup handlers called twice for active input fields
    
            * kwq/KWQTextArea.mm: (-[KWQTextAreaTextView keyUp:]): Don't call super because we
            don't want to pass the event down the responder chain.
            * kwq/KWQTextField.mm: (-[KWQTextField textView:shouldHandleEvent:]): Return NO for
            key up events because we don't want to pass the event down the responder chain.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4f29d51..025d5fe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-12-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3506706: REGRESSION (100-115): onkeyup handlers called twice for active input fields
+
+        * kwq/KWQTextArea.mm: (-[KWQTextAreaTextView keyUp:]): Don't call super because we
+        don't want to pass the event down the responder chain.
+        * kwq/KWQTextField.mm: (-[KWQTextField textView:shouldHandleEvent:]): Return NO for
+        key up events because we don't want to pass the event down the responder chain.
+
 2003-12-10  Richard Williamson   <rjw at apple.com>
 
 	Added method to get to the bridge from a view.  This is
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 4ef54dc..388207c 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -719,9 +719,10 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
     if (disabled)
         return;
     WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
-    if (![bridge interceptKeyEvent:event toView:self]) {
-	[super keyUp:event];
-    }
+    [bridge interceptKeyEvent:event toView:self];
+    // Don't call super because NSTextView will simply pass the
+    // event along the responder chain. This is arguably a bug in
+    // NSTextView; see Radar 3507083.
 }
 
 - (void)setEnabled:(BOOL)flag
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 84a5f29..fb8e554 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -505,9 +505,14 @@
 	return YES;
     }
 
-    if ([event type] == NSKeyDown || [event type] == NSKeyUp) {
+    NSEventType type = [event type];
+    if (type == NSKeyDown || type == NSKeyUp) {
         WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
-        return ![bridge interceptKeyEvent:event toView:view];
+        BOOL intercepted = [bridge interceptKeyEvent:event toView:view];
+        // Always return NO for key up events because we don't want them
+        // passed along the responder chain. This is arguably a bug in
+        // NSTextView; see Radar 3507083.
+        return type != NSKeyUp && !intercepted;
     }
     return YES;
 }

-- 
WebKit Debian packaging