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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4b6e6a9360ed9547b55020701276b6a72ab201fc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 10 20:57:24 2003 +0000

            Reviewed by Trey.
    
    	- fixed 3224622 -- REGRESSION: in an empty window, repeated tabs don't cycle back to location field
    
            Added logic to WebFrameView's next/previous that matches the logic in WebHTMLView.
            Looking for a better solution some day to the whole nextKeyView thing.
    
            * WebView.subproj/WebFrameView.m:
            (-[WebFrameView nextKeyView]): If being called from nextValidKeyView, return the nextKeyView
            of the WebView rather than of self.
            (-[WebFrameView previousKeyView]): Ditto.
            (-[WebFrameView nextValidKeyView]): Set the inNextValidKeyView flag.
            (-[WebFrameView previousValidKeyView]): Ditto.
    
            * WebView.subproj/WebFrameViewPrivate.h: Add the inNextValidKeyView flag.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c622429..d2f5c39 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2003-04-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3224622 -- REGRESSION: in an empty window, repeated tabs don't cycle back to location field
+
+        Added logic to WebFrameView's next/previous that matches the logic in WebHTMLView.
+        Looking for a better solution some day to the whole nextKeyView thing.
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView nextKeyView]): If being called from nextValidKeyView, return the nextKeyView
+        of the WebView rather than of self.
+        (-[WebFrameView previousKeyView]): Ditto.
+        (-[WebFrameView nextValidKeyView]): Set the inNextValidKeyView flag.
+        (-[WebFrameView previousValidKeyView]): Ditto.
+        
+        * WebView.subproj/WebFrameViewPrivate.h: Add the inNextValidKeyView flag.
+
 2003-04-10  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index cadc09d..7908e86 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -269,4 +269,44 @@ enum {
     }
 }
 
+- (NSView *)nextKeyView
+{
+    if (_private->inNextValidKeyView) {
+        WebFrame *webFrame = [self webFrame];
+        WebView *webView = [[self webFrame] webView];
+        if (webFrame == [webView mainFrame]) {
+            return [webView nextKeyView];
+        }
+    }
+    return [super nextKeyView];
+}
+
+- (NSView *)previousKeyView
+{
+    if (_private->inNextValidKeyView) {
+        WebFrame *webFrame = [self webFrame];
+        WebView *webView = [[self webFrame] webView];
+        if (webFrame == [webView mainFrame]) {
+            return [webView previousKeyView];
+        }
+    }
+    return [super previousKeyView];
+}
+
+- (NSView *)nextValidKeyView
+{
+    _private->inNextValidKeyView = YES;
+    NSView *view = [super nextValidKeyView];
+    _private->inNextValidKeyView = NO;
+    return view;
+}
+
+- (NSView *)previousValidKeyView
+{
+    _private->inNextValidKeyView = YES;
+    NSView *view = [super previousValidKeyView];
+    _private->inNextValidKeyView = NO;
+    return view;
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 9415411..71c0f95 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -20,6 +20,8 @@
     int marginHeight;
     
     NSArray *draggingTypes;
+    
+    BOOL inNextValidKeyView;
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 9415411..71c0f95 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -20,6 +20,8 @@
     int marginHeight;
     
     NSArray *draggingTypes;
+    
+    BOOL inNextValidKeyView;
 }
 
 @end

-- 
WebKit Debian packaging