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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit b1467d3384e6c696658f45d413d6aaf45c9947b2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 5 01:38:30 2003 +0000

    	Fixed 3363011.  Pass b/f related key down events to super if b/f is disabled.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebFrameView.m:
            (-[WebFrameView keyDown:]):
    
    
    	Fixed 3363345.  Retain static array used by IB to present WebView's bindable keys.
    
    	Review by Maciej
    
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _declaredKeys]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 28b5631..ee74d20 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-08-04  Richard Williamson  <rjw at apple.com>
+
+	Fixed 3363011.  Pass b/f related key down events to super if b/f is disabled.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView keyDown:]):
+
+
+	Fixed 3363345.  Retain static array used by IB to present WebView's bindable keys.
+
+	Review by Maciej
+
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _declaredKeys]):
+
 2003-08-04  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 9b9e60f..0854e34 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -136,11 +136,16 @@ enum {
     NSString *characters = [event characters];
     int index, count;
     BOOL callSuper = YES;
+    BOOL maintainsBackForwardList = [[[self webFrame] webView] backForwardList] == nil ? NO : YES;
 
     count = [characters length];
     for (index = 0; index < count; ++index) {
         switch ([characters characterAtIndex:index]) {
             case NSDeleteCharacter:
+                if (!maintainsBackForwardList) {
+                    callSuper = YES;
+                    break;
+                }
                 // This odd behavior matches some existing browsers,
                 // including Windows IE
                 if ([event modifierFlags] & NSShiftKeyMask) {
@@ -223,9 +228,22 @@ enum {
                 callSuper = NO;
                 break;
             case NSLeftArrowFunctionKey:
+                // Check back/forward related keys.
                 if ([event modifierFlags] & NSCommandKeyMask) {
+                    if (!maintainsBackForwardList) {
+                        callSuper = YES;
+                        break;
+                    }
                     [self _goBack];
-                } else if ([event modifierFlags] & NSAlternateKeyMask) {
+                } 
+                
+                // Now check scrolling related keys.
+                if (![self allowsScrolling]) {
+                    callSuper = YES;
+                    break;
+                }
+
+                if ([event modifierFlags] & NSAlternateKeyMask) {
                     [self _pageLeft];
                 } else {
                     [self _lineLeft];
@@ -233,9 +251,22 @@ enum {
                 callSuper = NO;
                 break;
             case NSRightArrowFunctionKey:
+                // Check back/forward related keys.
                 if ([event modifierFlags] & NSCommandKeyMask) {
+                    if (!maintainsBackForwardList) {
+                        callSuper = YES;
+                        break;
+                    }
                     [self _goForward];
-                } else if ([event modifierFlags] & NSAlternateKeyMask) {
+                } 
+                
+                // Now check scrolling related keys.
+                if (![self allowsScrolling]) {
+                    callSuper = YES;
+                    break;
+                }
+
+                if ([event modifierFlags] & NSAlternateKeyMask) {
                     [self _pageRight];
                 } else {
                     [self _lineRight];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index f8c1aaf..5cff487 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -762,7 +762,7 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
     static NSArray *declaredKeys = nil;
     
     if (!declaredKeys) {
-        declaredKeys = [NSArray arrayWithObjects:_WebMainFrameURLKey, _WebIsLoadingKey, _WebEstimatedProgressKey, _WebCanGoBackKey, _WebCanGoForwardKey, _WebMainFrameTitleKey, _WebMainFrameIconKey, nil];
+        declaredKeys = [[NSArray alloc] initWithObjects:_WebMainFrameURLKey, _WebIsLoadingKey, _WebEstimatedProgressKey, _WebCanGoBackKey, _WebCanGoForwardKey, _WebMainFrameTitleKey, _WebMainFrameIconKey, nil];
     }
 
     return declaredKeys;

-- 
WebKit Debian packaging