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

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:28:55 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 35e3529b11cb4fa03976569843bffa8062a88f28
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 1 23:44:43 2002 +0000

    WebKit:
    
    	Only send command key events if the plug-in is in the responder chain.
    
            * Plugins.subproj/WebPluginView.m:
            (-[WebPluginView isInResponderChain]):
            (-[WebPluginView performKeyEquivalent:]):
            (-[WebPluginView setWindow]): added some more logging
    
    WebBrowser:
    
    	Fixed: 2897678 - send urls from LS to new windows
    
            * AppController.m:
            (-[AppController handleGURLEvent:withReplyEvent:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1723 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 226edb0..0d39e09 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-08-01  Chris Blumenberg  <cblu at apple.com>
 
+	Only send command key events if the plug-in is in the responder chain.
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView isInResponderChain]):
+        (-[WebPluginView performKeyEquivalent:]):
+        (-[WebPluginView setWindow]): added some more logging
+
+2002-08-01  Chris Blumenberg  <cblu at apple.com>
+
 	Only send command keyDown once by ignoring the keyDown that comes after performKeyEquivalent.
 
         * Plugins.subproj/WebPluginView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 226edb0..0d39e09 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-08-01  Chris Blumenberg  <cblu at apple.com>
 
+	Only send command key events if the plug-in is in the responder chain.
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView isInResponderChain]):
+        (-[WebPluginView performKeyEquivalent:]):
+        (-[WebPluginView setWindow]): added some more logging
+
+2002-08-01  Chris Blumenberg  <cblu at apple.com>
+
 	Only send command keyDown once by ignoring the keyDown that comes after performKeyEquivalent.
 
         * Plugins.subproj/WebPluginView.m:
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index ffddffe..92cfee8 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -285,11 +285,28 @@
     }
 }
 
+- (BOOL)isInResponderChain
+{
+    NSResponder *responder = [[self window] firstResponder];
+
+    while(responder != nil){
+        if(responder == self){
+            return YES;
+        }
+        responder = [responder nextResponder];
+    }
+    return NO;
+}
+
 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
 {
     EventRecord event;
     bool acceptedEvent;
 
+    if(![self isInResponderChain]){
+        return NO;
+    }
+    
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = keyDown;
 
@@ -447,7 +464,8 @@
     NPError npErr =
 #endif
     NPP_SetWindow(instance, &window);
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x\n", npErr, (int)nPort.port);
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x, window.x:%d window.y:%d\n",
+                     npErr, (int)nPort.port, (int)window.x, (int)window.y);
 
 #if 0
     // Draw test    

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list