[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 0817b479e781dd890aefa5320bae9ab28be389aa
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 26 22:17:02 2002 +0000

    WebKit:
    
    	WebKit part of fix for 3009404 -- Back/Forward menu items should use [ and ],
    	but command-arrows should still work too.
    
            * WebView.subproj/WebController.h:
    	- added goForward to windowContext protocol. This is temporary, just like goBack
    	here is temporary; they can be migrated into the new back-forward-in-WebKit design
    	together.
            * WebView.subproj/WebView.m:
            (-[WebView keyDown:]): call _goBack and _goForward for command-arrow keys
    
            * WebView.subproj/WebViewPrivate.h,
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _goForward]): add _goForward, parallel to _existing goBack.
    
    WebBrowser:
    
    	WebBrowser part of fix for 3009404 -- Back/Forward menu items should use [ and ],
    	but command-arrows should still work too.
    
    	- fixed 3009385 -- standard command-arrow shortcuts don't work in Alexander
    	outline views
    	- fixed 3009388 -- left and right arrow should collapse/expand in Alexander
    	outline views
    
            * BrowserWebController.m:
            (-[BrowserWebController goForward]): Added, parallel to existing goBack. This is
    	a temporary place for this API, awaiting WebKit cleanup.
    
            * Defaults.plist: Set NSAllowSimpleArrowItemExpandDefault to true; gotta love
    	that this exists.
    
            * English.lproj/MainMenu.nib: Change menu shortcuts for Back, Forward, and
    	Last Search Results to use brackets instead of arrows
    
            * Help/KeyShortcuts.html: Update to match arrow -> bracket changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f214480..681acfd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-07-26  John Sullivan  <sullivan at apple.com>
+
+	WebKit part of fix for 3009404 -- Back/Forward menu items should use [ and ],
+	but command-arrows should still work too. 
+
+        * WebView.subproj/WebController.h:
+	- added goForward to windowContext protocol. This is temporary, just like goBack
+	here is temporary; they can be migrated into the new back-forward-in-WebKit design
+	together.
+        * WebView.subproj/WebView.m:
+        (-[WebView keyDown:]): call _goBack and _goForward for command-arrow keys
+
+        * WebView.subproj/WebViewPrivate.h,
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _goForward]): add _goForward, parallel to _existing goBack.
+
 2002-07-26  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed crash in unknown_text
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f214480..681acfd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-07-26  John Sullivan  <sullivan at apple.com>
+
+	WebKit part of fix for 3009404 -- Back/Forward menu items should use [ and ],
+	but command-arrows should still work too. 
+
+        * WebView.subproj/WebController.h:
+	- added goForward to windowContext protocol. This is temporary, just like goBack
+	here is temporary; they can be migrated into the new back-forward-in-WebKit design
+	together.
+        * WebView.subproj/WebView.m:
+        (-[WebView keyDown:]): call _goBack and _goForward for command-arrow keys
+
+        * WebView.subproj/WebViewPrivate.h,
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _goForward]): add _goForward, parallel to _existing goBack.
+
 2002-07-26  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed crash in unknown_text
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 8a5dd00..efc97bb 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -98,9 +98,10 @@
 - (NSWindow *)window;
 
 // FIXME: This is temporary. It's used to tell the client to "go back"
-// when the delete key is pressed. But we are going to move back/forward
-// handling into WebKit, and then this can be removed.
+// when the delete key or command-arrows are pressed. But we are going to move back/forward
+// handling into WebKit, and then these can be removed.
 - (void)goBack;
+- (void)goForward;
 
 @end
 
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index f39bf26..67f12e8 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -253,7 +253,9 @@ enum {
                 callSuper = NO;
                 break;
             case NSLeftArrowFunctionKey:
-                if ([event modifierFlags] & NSAlternateKeyMask) {
+                if ([event modifierFlags] & NSCommandKeyMask) {
+                    [self _goBack];
+                } else if ([event modifierFlags] & NSAlternateKeyMask) {
                     [self _pageLeft];
                 } else {
                     [self _lineLeft];
@@ -261,7 +263,9 @@ enum {
                 callSuper = NO;
                 break;
             case NSRightArrowFunctionKey:
-                if ([event modifierFlags] & NSAlternateKeyMask) {
+                if ([event modifierFlags] & NSCommandKeyMask) {
+                    [self _goForward];
+                } else if ([event modifierFlags] & NSAlternateKeyMask) {
                     [self _pageRight];
                 } else {
                     [self _lineRight];
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 945711e..328fed5 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -50,6 +50,7 @@
 - (void)_lineLeft;
 - (void)_lineRight;
 - (void)_goBack;
+- (void)_goForward;
 + (NSMutableDictionary *)_viewTypes;
 + (BOOL)_canShowMIMEType:(NSString *)MIMEType;
 @end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 945711e..328fed5 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -50,6 +50,7 @@
 - (void)_lineLeft;
 - (void)_lineRight;
 - (void)_goBack;
+- (void)_goForward;
 + (NSMutableDictionary *)_viewTypes;
 + (BOOL)_canShowMIMEType:(NSString *)MIMEType;
 @end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 18b8f19..bb90d28 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -241,4 +241,9 @@
     [[[self _controller] windowContext] goBack];
 }
 
+- (void)_goForward
+{
+    [[[self _controller] windowContext] goForward];
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 8a5dd00..efc97bb 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -98,9 +98,10 @@
 - (NSWindow *)window;
 
 // FIXME: This is temporary. It's used to tell the client to "go back"
-// when the delete key is pressed. But we are going to move back/forward
-// handling into WebKit, and then this can be removed.
+// when the delete key or command-arrows are pressed. But we are going to move back/forward
+// handling into WebKit, and then these can be removed.
 - (void)goBack;
+- (void)goForward;
 
 @end
 

-- 
WebKit Debian packaging