[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 c3f31e5d7fa71f7a0452c7779427cc04086ae899
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 12 16:11:00 2003 +0000

            Reviewed by John.
    
    	- fixed 3255281 -- REGRESSION: objc_error in key loop code, closing tab containing aintitcool.com page
    
            * kwq/KWQTextField.mm:
            (-[KWQSecureTextField nextKeyView]): Change back to using our own nextKeyView
            implementation. By returning the nextKeyView from KWQTextField, we ended up making
            AppKit very upset about the key view loop. This undoes a change I made last
            Thursday, so the regression is very new and was never in a release.
            (-[KWQSecureTextField previousKeyView]): More of the same.
            (-[KWQSecureTextField nextValidKeyView]): Ditto.
            (-[KWQSecureTextField previousValidKeyView]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5574e8d..7143100 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-05-12  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3255281 -- REGRESSION: objc_error in key loop code, closing tab containing aintitcool.com page
+
+        * kwq/KWQTextField.mm:
+        (-[KWQSecureTextField nextKeyView]): Change back to using our own nextKeyView
+        implementation. By returning the nextKeyView from KWQTextField, we ended up making
+        AppKit very upset about the key view loop. This undoes a change I made last
+        Thursday, so the regression is very new and was never in a release.
+        (-[KWQSecureTextField previousKeyView]): More of the same.
+        (-[KWQSecureTextField nextValidKeyView]): Ditto.
+        (-[KWQSecureTextField previousValidKeyView]): Ditto.
+
 2003-05-11  David Hyatt  <hyatt at apple.com>
 
 	The root element (HTML) tries to set itself to the lowest position
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5574e8d..7143100 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-05-12  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3255281 -- REGRESSION: objc_error in key loop code, closing tab containing aintitcool.com page
+
+        * kwq/KWQTextField.mm:
+        (-[KWQSecureTextField nextKeyView]): Change back to using our own nextKeyView
+        implementation. By returning the nextKeyView from KWQTextField, we ended up making
+        AppKit very upset about the key view loop. This undoes a change I made last
+        Thursday, so the regression is very new and was never in a release.
+        (-[KWQSecureTextField previousKeyView]): More of the same.
+        (-[KWQSecureTextField nextValidKeyView]): Ditto.
+        (-[KWQSecureTextField previousValidKeyView]): Ditto.
+
 2003-05-11  David Hyatt  <hyatt at apple.com>
 
 	The root element (HTML) tries to set itself to the lowest position
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 8a10aa0..5ffcbe8 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -55,6 +55,7 @@
 // Another is hook up next and previous key views to KHTML.
 @interface KWQSecureTextField : NSSecureTextField <KWQWidgetHolder>
 {
+    BOOL inNextValidKeyView;
     BOOL inSetFrameSize;
 }
 @end
@@ -502,26 +503,32 @@
 
 - (NSView *)nextKeyView
 {
-    ASSERT([self delegate] == nil || [[self delegate] isKindOfClass:[KWQTextField class]]);
-    return [(KWQTextField *)[self delegate] nextKeyView];
+    return inNextValidKeyView
+        ? KWQKHTMLPart::nextKeyViewForWidget([self widget], KWQSelectingNext)
+        : [super nextKeyView];
 }
 
 - (NSView *)previousKeyView
 {
-    ASSERT([self delegate] == nil || [[self delegate] isKindOfClass:[KWQTextField class]]);
-    return [(KWQTextField *)[self delegate] previousKeyView];
+   return inNextValidKeyView
+        ? KWQKHTMLPart::nextKeyViewForWidget([self widget], KWQSelectingPrevious)
+        : [super previousKeyView];
 }
 
 - (NSView *)nextValidKeyView
 {
-    ASSERT([self delegate] == nil || [[self delegate] isKindOfClass:[KWQTextField class]]);
-    return [(KWQTextField *)[self delegate] nextValidKeyView];
+    inNextValidKeyView = YES;
+    NSView *view = [super nextValidKeyView];
+    inNextValidKeyView = NO;
+    return view;
 }
 
 - (NSView *)previousValidKeyView
 {
-    ASSERT([self delegate] == nil || [[self delegate] isKindOfClass:[KWQTextField class]]);
-    return [(KWQTextField *)[self delegate] previousValidKeyView];
+    inNextValidKeyView = YES;
+    NSView *view = [super previousValidKeyView];
+    inNextValidKeyView = NO;
+    return view;
 }
 
 // The currentEditor method does not work for secure text fields.

-- 
WebKit Debian packaging