[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 563180dccc7c7363a8218c13353f47e9bc1621d2
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 22 16:16:55 2004 +0000

            Reviewed by Darin
    
            Work around this bug:
            <rdar://problem/3630640>: "Calling interpretKeyEvents: in a custom text view can fail to process keys right after app startup"
    
            * WebView.subproj/WebView.m:
            (-[WebView _editingKeyDown:]): The issue is with a message to nil in AppKit
            key binding manager code. Add call to [NSKeyBindingManager sharedKeyBindingManager] to make
            sure the not-supposed-to-be-nil object is created before calling interpretKeyEvents:.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ddfc635..e2f0906 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2004-04-22  Ken Kocienda  <kocienda at apple.com>
 
+        Reviewed by Darin
+
+        Work around this bug:
+        <rdar://problem/3630640>: "Calling interpretKeyEvents: in a custom text view can fail to process keys right after app startup"
+
+        * WebView.subproj/WebView.m:
+        (-[WebView _editingKeyDown:]): The issue is with a message to nil in AppKit
+        key binding manager code. Add call to [NSKeyBindingManager sharedKeyBindingManager] to make
+        sure the not-supposed-to-be-nil object is created before calling interpretKeyEvents:.
+
+2004-04-22  Ken Kocienda  <kocienda at apple.com>
+
         Reviewed by Hyatt
 
         Added calls to ensure caret visibility after the editing action is done.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 6049eb1..08219b6 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -59,6 +59,10 @@
 #import <Foundation/NSURLRequestPrivate.h>
 #import <Foundation/NSUserDefaults_NSURLExtras.h>
 
+// Included to help work around this bug:
+// <rdar://problem/3630640>: "Calling interpretKeyEvents: in a custom text view can fail to process keys right after app startup"
+#import <AppKit/NSKeyBindingManager.h>
+
 NSString *WebElementDOMNodeKey =            @"WebElementDOMNode";
 NSString *WebElementFrameKey =              @"WebElementFrame";
 NSString *WebElementImageKey =              @"WebElementImage";
@@ -2079,7 +2083,12 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 @implementation WebView (WebViewEditing)
 
 - (void)_editingKeyDown:(NSEvent *)event
-{
+{   
+    // Work around this bug:
+    // <rdar://problem/3630640>: "Calling interpretKeyEvents: in a custom text view can fail to process keys right after app startup"
+    [NSKeyBindingManager sharedKeyBindingManager];
+    
+    // Now process the key normally
     [self interpretKeyEvents:[NSArray arrayWithObject:event]];
 }
 

-- 
WebKit Debian packaging