[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 2e0eacb326e42cd1a60b756b72d53a1d0ff20105
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 31 18:44:30 2003 +0000

    WebKit:
    
            Reviewed by John.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge nextKeyViewOutsideWebFrameViews]): Get next key view from WebView, only using
            the top level WebFrameView if the WebView doesn't have one set (for compatibility in case
            some of our current WebKit clients are using this).
            (-[WebBridge previousKeyViewOutsideWebFrameViews]): Ditto.
    
    WebBrowser:
    
            Reviewed by John.
    
    	- fixed 3213095 -- REGRESSION: can't clear History; selector removeAllEntries not recognized
    
            * GlobalHistory.m: (-[GlobalHistory appendClearHistoryItemToMenuWithEnabledState:]):
            Use the new name, removeAllItems, instead of the old name removeAllEntries.
    
    	- use the WebView for the keyboard loop rather than going at the WebFrameView explicitly
    
            * BrowserWindowController.m: (-[BrowserWindowController updateKeyboardLoop]):
            Just use WebView instead of digging in for the WebFrameView.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 43d13f0..afd8627 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by John.
 
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge nextKeyViewOutsideWebFrameViews]): Get next key view from WebView, only using
+        the top level WebFrameView if the WebView doesn't have one set (for compatibility in case
+        some of our current WebKit clients are using this).
+        (-[WebBridge previousKeyViewOutsideWebFrameViews]): Ditto.
+
+2003-03-31  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
         - fixed 3211730 -- REGRESSION: Flash spawns blank page then loads new page inside banner itself
 
         * Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView loadPluginRequest:]):
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 671bf32..ef76e92 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -499,12 +499,24 @@
 
 - (NSView *)nextKeyViewOutsideWebFrameViews
 {
-    return [[[[frame webView] mainFrame] frameView] nextKeyView];
+    WebView *webView = [frame webView];
+    NSView *nextKeyView = [webView nextKeyView];
+    if (nextKeyView) {
+        return nextKeyView;
+    }
+    // Old way, here so we don't break early WebKit adopters, but could be removed later.
+    return [[[webView mainFrame] frameView] nextKeyView];
 }
 
 - (NSView *)previousKeyViewOutsideWebFrameViews
 {
-    return [[[[frame webView] mainFrame] frameView] previousKeyView];
+    WebView *webView = [frame webView];
+    NSView *previousKeyView = [webView previousKeyView];
+    if (previousKeyView) {
+        return previousKeyView;
+    }
+    // Old way, here so we don't break early WebKit adopters, but could be removed later.
+    return [[[webView mainFrame] frameView] previousKeyView];
 }
 
 - (BOOL)defersLoading

-- 
WebKit Debian packaging