[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 461134bfafe43d10c1d2c514f24ef7bf5156cd00
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 26 14:22:51 2004 +0000

            - fixed the following bugs:
    
            <rdar://problem/3601630>: command-modified keypresses that would activate links are ignored by WebKit
            <rdar://problem/3601604>: WebActionModifierFlagsKey not set correctly for modified keypresses that activate links
            <rdar://problem/3544946>: cmd-return should open a link in a new tab
    
            Reviewed by Darin.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _actionInformationForNavigationType:event:originalURL:]):
            Pass modifier flags always, not just for mouse events. This fixes 3601604.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView performKeyEquivalent:]):
            Give the bridge a chance to intercept command-modified keypresses. This fixes 3601630.
    
            Together these two changes fix 3544946.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 29afed0..1474367 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2004-03-26  John Sullivan  <sullivan at apple.com>
+
+        - fixed the following bugs:
+        
+        <rdar://problem/3601630>: command-modified keypresses that would activate links are ignored by WebKit
+        <rdar://problem/3601604>: WebActionModifierFlagsKey not set correctly for modified keypresses that activate links
+        <rdar://problem/3544946>: cmd-return should open a link in a new tab
+
+        Reviewed by Darin.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _actionInformationForNavigationType:event:originalURL:]):
+        Pass modifier flags always, not just for mouse events. This fixes 3601604.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView performKeyEquivalent:]):
+        Give the bridge a chance to intercept command-modified keypresses. This fixes 3601630.
+        
+        Together these two changes fix 3544946.
+
 2004-03-25  David Hyatt  <hyatt at apple.com>
 
 	Implement the rest of the search field.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 07ddecf..0e3ec7a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -1516,12 +1516,13 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                     nil];
             }
         }
-        
+            
         // fall through
         
         default:
             return [NSDictionary dictionaryWithObjectsAndKeys:
                 [NSNumber numberWithInt:navigationType], WebActionNavigationTypeKey,
+                [NSNumber numberWithInt:[event modifierFlags]], WebActionModifierFlagsKey,
                 URL, WebActionOriginalURLKey,
                 nil];
     }
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 456e0bc..7c795fc 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1910,6 +1910,20 @@ static WebHTMLView *lastHitView = nil;
     [[self _bridge] setTextSizeMultiplier:[[self _webView] textSizeMultiplier]];    
 }
 
+- (BOOL)performKeyEquivalent:(NSEvent *)event
+{
+    // Pass command-key combos through WebCore so Command-return on an active link is treated
+    // as a modified activation rather than ignored. Note that this means web pages have a crack 
+    // at intercepting command-modified keypresses now. If this turns out to cause havoc we
+    // can restrict this to only send the event through WebCore if it contains the Return or
+    // Enter key.
+    if ([[self _bridge] interceptKeyEvent:event toView:self]) {
+        return YES;
+    }
+
+    return [super performKeyEquivalent:event];
+}
+
 - (void)keyDown:(NSEvent *)event
 {
     BOOL intercepted = [[self _bridge] interceptKeyEvent:event toView:self];

-- 
WebKit Debian packaging