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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit aecfa31f037732358d3f17b413f04fb1d3d4281d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 22:09:16 2004 +0000

    WebCore:
    
            Reviewed by John
    
            Fix for this bug:
    
            <rdar://problem/3588717>: REGRESSION (125-131u): Tabbing to links and tabbing in bookmarks view no longer works
    
            Change some support methods which feed editing key events to
            WebKit. The real fix is on the WebKit side.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::editingKeyEvent): Call new -editingKeyDown:
            on WebCoreBridge, as described below.
            * kwq/WebCoreBridge.h: Changed -keyDown: to -editingKeyDown:
            since we want to tell WebView about editing key events
            in a way that does not interfere with other key down
            events the WebView processes. This is not necessary in the
            strictest sense, but it seems reasonable to keep the
            terminology clear.
    
    WebKit:
    
            Reviewed by John
    
            Fix for this bug:
    
            <rdar://problem/3588717>: REGRESSION (125-131u): Tabbing to links and tabbing in bookmarks view no longer works
    
            WebView can't lay claim to -keyDown: just for editing events, as
            this gets in the way of tab processing. The solution is to give
            WebView a private method for processing editing key events fed to
            it from over the bridge, and leave -keyDown: unimplemented.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge editingKeyDown:]): Changed from -keyDown: to keep
            terminology consistent with renamed WebView -editingKeyDown: method.
            * WebView.subproj/WebView.m:
            (-[WebView editingKeyDown:]): Give WebView a method to handle
            editing key events in a way that does not interfere with other key down
            events it processes.
            * WebView.subproj/WebViewPrivate.h: Declare -editingKeyDown: method.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3dfc9f2..bb9bc82 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,24 @@
+2004-03-15  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+        Fix for this bug:
+        
+        <rdar://problem/3588717>: REGRESSION (125-131u): Tabbing to links and tabbing in bookmarks view no longer works
+
+        Change some support methods which feed editing key events to 
+        WebKit. The real fix is on the WebKit side.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::editingKeyEvent): Call new -editingKeyDown:
+        on WebCoreBridge, as described below.
+        * kwq/WebCoreBridge.h: Changed -keyDown: to -editingKeyDown:
+        since we want to tell WebView about editing key events
+        in a way that does not interfere with other key down
+        events the WebView processes. This is not necessary in the
+        strictest sense, but it seems reasonable to keep the
+        terminology clear.
+
 === Safari-132 ===
 
 2004-03-12  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3c6b127..522c9d7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2873,6 +2873,6 @@ void KWQKHTMLPart::clearUndoRedoOperations()
 
 void KWQKHTMLPart::editingKeyEvent()
 {
-    [_bridge keyDown:_currentEvent];
+    [_bridge editingKeyDown:_currentEvent];
 }
 
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index be6285a..3794f70 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -420,7 +420,7 @@ typedef enum {
 - (void)registerCommandForRedo:(id)arg;
 - (void)clearUndoRedoOperations;
 
-- (void)keyDown:(NSEvent *)event;
+- (void)editingKeyDown:(NSEvent *)event;
 
 @end
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 47a8405..1a9bd8d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2004-03-15  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+        Fix for this bug:
+        
+        <rdar://problem/3588717>: REGRESSION (125-131u): Tabbing to links and tabbing in bookmarks view no longer works
+
+        WebView can't lay claim to -keyDown: just for editing events, as
+        this gets in the way of tab processing. The solution is to give
+        WebView a private method for processing editing key events fed to
+        it from over the bridge, and leave -keyDown: unimplemented. 
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge editingKeyDown:]): Changed from -keyDown: to keep 
+        terminology consistent with renamed WebView -editingKeyDown: method.
+        * WebView.subproj/WebView.m:
+        (-[WebView editingKeyDown:]): Give WebView a method to handle
+        editing key events in a way that does not interfere with other key down
+        events it processes.
+        * WebView.subproj/WebViewPrivate.h: Declare -editingKeyDown: method.
+
 === Safari-132 ===
 
 2004-03-15  Darin Adler  <darin at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 61f45a1..4df9d22 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1179,9 +1179,9 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
     [undoManager removeAllActionsWithTarget:self];
 }
 
-- (void)keyDown:(NSEvent *)event
+- (void)editingKeyDown:(NSEvent *)event
 {
-    [[_frame webView] keyDown:event];
+    [[_frame webView] editingKeyDown:event];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 90b5ad3..4fb00d4 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2020,7 +2020,7 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 */
 @implementation WebView (WebEditingExtras)
 
-- (void)keyDown:(NSEvent *)event
+- (void)editingKeyDown:(NSEvent *)event
 {
     [self interpretKeyEvents:[NSArray arrayWithObject:event]];
 }
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 2acec87..ac0c38e 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -340,6 +340,7 @@ extern NSString * const WebViewDidChangeSelectionNotification;
 - (DOMRange *)selectedDOMRange;
 - (void)setEditingDelegate:(id)delegate;
 - (id)editingDelegate;
+- (void)editingKeyDown:(NSEvent *)event;
 @end
 
 

-- 
WebKit Debian packaging