[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 4fb96131f51475285bcfc0863b6893ae2a53a0db
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 21:51:29 2003 +0000

            Reviewed by Maciej.
    
    	- fixed two-day-old regression where we get nil-dereferences with text areas
    
            * kwq/KWQTextArea.mm:
            (-[KWQTextArea _createTextView]): Don't do the setWidget: here because widget is always nil at this point.
            (-[KWQTextArea initWithQTextEdit:]): Do it here instead.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9c0f466..ca8d045 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed two-day-old regression where we get nil-dereferences with text areas
+
+        * kwq/KWQTextArea.mm:
+        (-[KWQTextArea _createTextView]): Don't do the setWidget: here because widget is always nil at this point.
+        (-[KWQTextArea initWithQTextEdit:]): Do it here instead.
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3126927, don't let absolute positioned blocks grow
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9c0f466..ca8d045 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-01-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed two-day-old regression where we get nil-dereferences with text areas
+
+        * kwq/KWQTextArea.mm:
+        (-[KWQTextArea _createTextView]): Don't do the setWidget: here because widget is always nil at this point.
+        (-[KWQTextArea initWithQTextEdit:]): Do it here instead.
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3126927, don't let absolute positioned blocks grow
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 8c1e741..53a3a53 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -83,7 +83,6 @@ const float LargeNumberForText = 1.0e7;
     textView = [[KWQTextAreaTextView alloc] initWithFrame:textFrame];
     [[textView textContainer] setWidthTracksTextView:YES];
     [textView setRichText:NO];
-    [textView setWidget:widget];
 
     // Setup attributes for default cases WRAP=SOFT|VIRTUAL and WRAP=HARD|PHYSICAL.
     // If WRAP=OFF we reset many of these attributes.
@@ -114,7 +113,10 @@ const float LargeNumberForText = 1.0e7;
 - initWithQTextEdit:(QTextEdit *)w 
 {
     [super init];
+
     widget = w;
+    [textView setWidget:widget];
+
     return self;
 }
 
@@ -497,7 +499,6 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
     }
 }
 
-
 - (BOOL)becomeFirstResponder
 {
     BOOL become = [super becomeFirstResponder];
@@ -506,7 +507,7 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
 	[self selectAll:nil];
 	[self _KWQ_setKeyboardFocusRingNeedsDisplay];
 	QFocusEvent event(QEvent::FocusIn);
-	(const_cast<QObject *>(widget->eventFilterObject()))->eventFilter(widget, &event);
+	const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
     }
        
     return become;
@@ -519,7 +520,7 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
     if (resign) {
 	[self _KWQ_setKeyboardFocusRingNeedsDisplay];
 	QFocusEvent event(QEvent::FocusOut);
-	(const_cast<QObject *>(widget->eventFilterObject()))->eventFilter(widget, &event);
+	const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
     }
 
     return resign;

-- 
WebKit Debian packaging