[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 1fc4452b03697474338e3320470a124fcdf3c904
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 26 16:44:51 2003 +0000

            Reviewed by John
    
    	Fix for this bug:
    
    	<rdar://problem/3435532>: REGRESSION: tabbing to textareas causes infinite recursion
    
    	Add recursion guards to the becomeFirstResponder method, otherwise calling
    	eventFilter with a FocusIn event will cause the infinite recursion
    	described in the bug.
    
            * kwq/KWQTextArea.mm:
            (-[KWQTextAreaTextView becomeFirstResponder]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5073 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 30fb237..95a9d0a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-09-26  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+	Fix for this bug:
+
+	<rdar://problem/3435532>: REGRESSION: tabbing to textareas causes infinite recursion
+
+	Add recursion guards to the becomeFirstResponder method, otherwise calling
+	eventFilter with a FocusIn event will cause the infinite recursion
+	described in the bug.
+
+        * kwq/KWQTextArea.mm:
+        (-[KWQTextAreaTextView becomeFirstResponder]):
+
 2003-09-25  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 30fb237..95a9d0a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-09-26  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+	Fix for this bug:
+
+	<rdar://problem/3435532>: REGRESSION: tabbing to textareas causes infinite recursion
+
+	Add recursion guards to the becomeFirstResponder method, otherwise calling
+	eventFilter with a FocusIn event will cause the infinite recursion
+	described in the bug.
+
+        * kwq/KWQTextArea.mm:
+        (-[KWQTextAreaTextView becomeFirstResponder]):
+
 2003-09-25  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 1a87c71..4c0175f 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -52,6 +52,7 @@
 @interface KWQTextAreaTextView : NSTextView <KWQWidgetHolder>
 {
     QTextEdit *widget;
+    BOOL inBecomeFirstResponder;
 }
 - (void)setWidget:(QTextEdit *)widget;
 @end
@@ -551,8 +552,13 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
 - (BOOL)becomeFirstResponder
 {
     BOOL become = [super becomeFirstResponder];
+    
+    if (inBecomeFirstResponder) 
+        return become;
 
     if (become) {
+        inBecomeFirstResponder = YES;
+
         // Select all the text if we are tabbing in, but otherwise preserve/remember
         // the selection from last time we had focus (to match WinIE).
         if ([[self window] keyViewSelectionDirection] != NSDirectSelection) {
@@ -564,8 +570,10 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
 	[self _KWQ_setKeyboardFocusRingNeedsDisplay];
 	QFocusEvent event(QEvent::FocusIn);
 	const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
+
+        inBecomeFirstResponder = NO;
     }
-       
+
     return become;
 }
 

-- 
WebKit Debian packaging