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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 4e1275ddb076cef92582ede8eef58cadb5afeba7
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 19 23:14:55 2004 +0000

    WebKit:
    
            - WebKit part of fix for <rdar://problem/3292380>: Cycle Tabs keyboard shortcut
            (cmd-shift-arrows) conflicts with text editing
    
            Reviewed by Chris.
    
            * WebView.subproj/WebFrameView.m:
            (-[WebFrameView keyDown:]):
            If shift key is down along with an arrow key, call super rather than eating
            event since we don't handle any shifted events here.
    
    WebBrowser:
    
            - fixed <rdar://problem/3292380>: Cycle Tabs keyboard shortcut
            (cmd-shift-arrows) conflicts with text editing
    
            Reviewed by Chris.
    
            * BrowserNSEventExtras.h:
            * BrowserNSEventExtras.m:
            (-[NSEvent isCommandLeftArrowKeyDown]):
            (-[NSEvent isCommandRightArrowKeyDown]):
            New methods
    
            * BrowserWindow.m:
            (-[BrowserWindow keyDown:]):
            Still honor old shortcuts of command-shift-arrows, but only
            if no other view has intercepted them already.
    
            * English.lproj/MainMenu.nib:
            Changed keyboard shortcuts for Select Next Tab and
            Select Previous Tab menu items to option-command-] and [
    
            * Debug/Shortcuts.html:
            Updated for these changes
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6100 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9b9f315..7174602 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-19  John Sullivan  <sullivan at apple.com>
+
+        - WebKit part of fix for <rdar://problem/3292380>: Cycle Tabs keyboard shortcut 
+        (cmd-shift-arrows) conflicts with text editing
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView keyDown:]):
+        If shift key is down along with an arrow key, call super rather than eating
+        event since we don't handle any shifted events here.
+
 2004-02-15  Darin Adler  <darin at apple.com>
 
         Reviewed by John and Don.
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index f187d3f..7036708 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -614,6 +614,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSUpArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 if (![self allowsScrolling] ||
                     [[[self window] firstResponder] isKindOfClass:[NSPopUpButton class]]) {
                     // Let arrow keys go through to pop up buttons
@@ -632,6 +637,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSDownArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 if (![self allowsScrolling] ||
                     [[[self window] firstResponder] isKindOfClass:[NSPopUpButton class]]) {
                     // Let arrow keys go through to pop up buttons
@@ -650,6 +660,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSLeftArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 // Check back/forward related keys.
                 if ([event modifierFlags] & NSCommandKeyMask) {
                     if (!maintainsBackForwardList) {
@@ -673,6 +688,11 @@ static NSMutableDictionary *viewTypes;
                 callSuper = NO;
                 break;
             case NSRightArrowFunctionKey:
+                // We don't handle shifted arrow keys here, so let super have a chance.
+                if ([event modifierFlags] & NSShiftKeyMask) {
+                    callSuper = YES;
+                    break;
+                }
                 // Check back/forward related keys.
                 if ([event modifierFlags] & NSCommandKeyMask) {
                     if (!maintainsBackForwardList) {

-- 
WebKit Debian packaging