[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 f1002bfe64f61080f57d749d68308a2c52b31a87
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 29 17:58:30 2002 +0000

            Reviewed by Don.
    
    	- fixed 3120630 -- spacebar scrolls the page as well as pausing the QuickTime movie
    
    	Imitate Mozilla and OmniWeb by not propagating keyboard events after passing them to
    	plug-ins regardless of what the plug-in returns, rather than imitating MacIE, which
            looks at the return value from NPP_HandleEvent.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView keyUp:]): Remove call to super, add comment.
            (-[WebBaseNetscapePluginView keyDown:]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5f5db94..46423f6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
 2002-12-29  Darin Adler  <darin at apple.com>
 
+        Reviewed by Don.
+
+	- fixed 3120630 -- spacebar scrolls the page as well as pausing the QuickTime movie
+
+	Imitate Mozilla and OmniWeb by not propagating keyboard events after passing them to
+	plug-ins regardless of what the plug-in returns, rather than imitating MacIE, which
+        looks at the return value from NPP_HandleEvent.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView keyUp:]): Remove call to super, add comment.
+        (-[WebBaseNetscapePluginView keyDown:]): Ditto.
+
+2002-12-29  Darin Adler  <darin at apple.com>
+
         Reviewed by Ken and Don.
 
 	- fixed 3136120 -- much content missing at www.olympic.org
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index ae01686..d6f492e 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -469,27 +469,29 @@ typedef struct {
         event.message = [self keyMessageForEvent:theEvent];
     }
     
-    BOOL acceptedEvent = [self sendEvent:&event];
+    BOOL acceptedEvent;
+    acceptedEvent = [self sendEvent:&event];
 
     LOG(Plugins, "NPP_HandleEvent(keyUp): %d charCode:%c keyCode:%lu",
         acceptedEvent, (char) (event.message & charCodeMask), (event.message & keyCodeMask));
     
-    // If the plug-in didn't accept this event,
-    // pass it along so that keyboard scrolling, for example, will work.
-    if (!acceptedEvent){
-        [super keyUp:theEvent];
-    }
+    // We originally thought that if the plug-in didn't accept this event,
+    // we should pass it along so that keyboard scrolling, for example, will work.
+    // In practice, this is not a good idea, because browsers tend to eat the event but return false.
+    // MacIE handles each key event twice because of this, but we will emulate the other browsers instead.
 }
 
 - (void)keyDown:(NSEvent *)theEvent
 {
     EventRecord event;
 
+#if 0
     // Some command keys are sent with both performKeyEquivalent and keyDown.
     // We should send only 1 keyDown to the plug-in, so we'll ignore this one.
-    if([theEvent modifierFlags] & NSCommandKeyMask){
+    if ([theEvent modifierFlags] & NSCommandKeyMask) {
         return;
     }
+#endif
     
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = keyDown;
@@ -498,16 +500,16 @@ typedef struct {
         event.message = [self keyMessageForEvent:theEvent];
     }
     
-    BOOL acceptedEvent = [self sendEvent:&event];
+    BOOL acceptedEvent;
+    acceptedEvent = [self sendEvent:&event];
 
     LOG(Plugins, "NPP_HandleEvent(keyDown): %d charCode:%c keyCode:%lu",
         acceptedEvent, (char) (event.message & charCodeMask), (event.message & keyCodeMask));
     
-    // If the plug-in didn't accept this event,
-    // pass it along so that keyboard scrolling, for example, will work.
-    if (!acceptedEvent){
-        [super keyDown:theEvent];
-    }
+    // We originally thought that if the plug-in didn't accept this event,
+    // we should pass it along so that keyboard scrolling, for example, will work.
+    // In practice, this is not a good idea, because browsers tend to eat the event but return false.
+    // MacIE handles each key event twice because of this, but we will emulate the other browsers instead.
 }
 
 - (BOOL)isInResponderChain

-- 
WebKit Debian packaging