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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit f7ab5808759b9ed6469b015538e8f617e051dc6e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 4 05:52:26 2003 +0000

    WebCore:
    
            Reviewed by Trey.
    
    	- fixed 3031544 - can't login on secure paytrust page due to lack of onchange handler
    
            * kwq/KWQTextField.mm:
            (-[KWQTextField control:textShouldBeginEditing:]): Send FocusIn event
    	to event filter here.
            (-[KWQTextField control:textShouldEndEditing:]): Send FocusOut event to
    	event filter here.
            (-[KWQTextField fieldEditorDidBecomeFirstResponder]): Removed.
            (-[KWQTextField fieldEditorDidResignFirstResponder]): Removed.
            * kwq/WebCoreFirstResponderChanges.h: Removed first responder methods.
    
    WebKit:
    
            Reviewed by Trey.
    
    	- removed no-longer forwarding of become/resignFirstResponder
    
            * WebView.subproj/WebHTMLViewPrivate.m: Removed
    	become/resignFirstResponder poses for WebNSTextView.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d9b68c5..c942d82 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-04-03  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3031544 - can't login on secure paytrust page due to lack of onchange handler
+
+        * kwq/KWQTextField.mm:
+        (-[KWQTextField control:textShouldBeginEditing:]): Send FocusIn event
+	to event filter here.
+        (-[KWQTextField control:textShouldEndEditing:]): Send FocusOut event to
+	event filter here.
+        (-[KWQTextField fieldEditorDidBecomeFirstResponder]): Removed.
+        (-[KWQTextField fieldEditorDidResignFirstResponder]): Removed.
+        * kwq/WebCoreFirstResponderChanges.h: Removed first responder methods.
+
 2003-04-03  Trey Matteson  <trey at apple.com>
 
 	3067928 - printing should not break lines in half
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d9b68c5..c942d82 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-04-03  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3031544 - can't login on secure paytrust page due to lack of onchange handler
+
+        * kwq/KWQTextField.mm:
+        (-[KWQTextField control:textShouldBeginEditing:]): Send FocusIn event
+	to event filter here.
+        (-[KWQTextField control:textShouldEndEditing:]): Send FocusOut event to
+	event filter here.
+        (-[KWQTextField fieldEditorDidBecomeFirstResponder]): Removed.
+        (-[KWQTextField fieldEditorDidResignFirstResponder]): Removed.
+        * kwq/WebCoreFirstResponderChanges.h: Removed first responder methods.
+
 2003-04-03  Trey Matteson  <trey at apple.com>
 
 	3067928 - printing should not break lines in half
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 63bbf9d..9dbf966 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -223,13 +223,27 @@
 - (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor
 {
     WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
-    return [bridge control:control textShouldBeginEditing:fieldEditor];
+    BOOL should = [bridge control:control textShouldBeginEditing:fieldEditor];
+
+    if (should) {
+	QFocusEvent event(QEvent::FocusIn);
+	(const_cast<QObject *>(widget->eventFilterObject()))->eventFilter(widget, &event);
+    }
+
+    return should;
 }
 
 - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor
 {
     WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
-    return [bridge control:control textShouldEndEditing:fieldEditor];
+    BOOL should = [bridge control:control textShouldEndEditing:fieldEditor];
+
+    if (should) {
+	QFocusEvent event(QEvent::FocusOut);
+	(const_cast<QObject *>(widget->eventFilterObject()))->eventFilter(widget, &event);
+    }
+
+    return should;
 }
 
 - (BOOL)control:(NSControl *)control didFailToFormatString:(NSString *)string errorDescription:(NSString *)error
@@ -317,19 +331,6 @@
     return [super becomeFirstResponder];
 }
 
-- (void)fieldEditorWillBecomeFirstResponder
-{
-    //FIXME:  Note due to 3178518, this code is never called.
-    QFocusEvent event(QEvent::FocusIn);
-    (const_cast<QObject *>(widget->eventFilterObject()))->eventFilter(widget, &event);
-}
-
-- (void)fieldEditorWillResignFirstResponder
-{
-    QFocusEvent event(QEvent::FocusOut);
-    (const_cast<QObject *>(widget->eventFilterObject()))->eventFilter(widget, &event);
-}
-
 - (void)display
 {
     // This is a workaround for Radar 2753974.
diff --git a/WebCore/kwq/WebCoreFirstResponderChanges.h b/WebCore/kwq/WebCoreFirstResponderChanges.h
index aa9a035..3c6f70e 100644
--- a/WebCore/kwq/WebCoreFirstResponderChanges.h
+++ b/WebCore/kwq/WebCoreFirstResponderChanges.h
@@ -25,12 +25,9 @@
 
 #import <Foundation/Foundation.h>
 
-// The WebCore client must arrange to call these methods when a text
-// field's field editor becomes or resigns first responder, and before
-// and after it process a mouseDown: event.
+// The WebCore client must arrange to call these methods after a text
+// field's field editor process a mouseDown: event.
 
 @interface NSObject (WebCoreFieldDelegate)
-- (void)fieldEditorWillBecomeFirstResponder;
-- (void)fieldEditorWillResignFirstResponder;
 - (void)fieldEditorDidMouseDown:(NSEvent *)event;
 @end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 25feb43..c35971a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-04-03  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Trey.
+
+	- removed no-longer forwarding of become/resignFirstResponder
+	
+        * WebView.subproj/WebHTMLViewPrivate.m: Removed
+	become/resignFirstResponder poses for WebNSTextView.
+
+2003-04-03  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Richard and Don.
 
         * WebView.subproj/WebDataProtocol.m:
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index b16abe4..35c041f 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -675,43 +675,6 @@ static BOOL inNSTextViewDrawRect;
     inNSTextViewDrawRect = NO;
 }
 
-- (BOOL)resignFirstResponder
-{
-    NSLog(@"WebTextView resignFirstResponder");
-    
-    bool resign = [super resignFirstResponder];
-
-    if (![self _web_inHTMLView]) {
-	return resign;
-    }
-
-    NSView *possibleContainingField = [self delegate];
-
-    if (resign && [possibleContainingField respondsToSelector:@selector(fieldEditorWillResignFirstResponder)]) {
-	[possibleContainingField fieldEditorWillResignFirstResponder];
-    }
-
-    return resign;
-}
-
-- (BOOL)becomeFirstResponder
-{
-    bool become = [super becomeFirstResponder];
-
-    if (![self _web_inHTMLView]) {
-	return become;
-    }
-
-    NSView *possibleContainingField = [self delegate];
-
-    if (become && [possibleContainingField respondsToSelector:@selector(fieldEditorWillBecomeFirstResponder)]) {
-        //FIXME:  Note due to 3178518, this code is never executed.  Delegate==nil at this point.
-        [possibleContainingField fieldEditorWillBecomeFirstResponder];
-    }
-
-    return become;
-}
-
 -(void)mouseDown:(NSEvent *)event
 {
     NSView *possibleContainingField = [self delegate];

-- 
WebKit Debian packaging