WebCore:

        Reviewed by Chris Blumenberg.

        Test cases added: none, only affects Safari autofill

        - more work to wean form-related SPI from NSView. All that's left (but this is a big "all")
        is viewForElement: and elementForView:

        * kwq/WebCoreBridge.h:
        Rename control:textView:doCommandBySelector: to textField:doCommandBySelector:, and changed
        to take DOMHTMLInputElement* rather than NSControl* and NSTextView*

        * kwq/KWQTextField.mm:
        (-[KWQTextFieldController control:textView:doCommandBySelector:]):
        call renamed bridge method, passing DOMElement* instead of NSView*

WebKit:

        Reviewed by Chris Blumenberg.

        - more work to wean form-related SPI from NSView. All that's left (but this is a big "all")
        is viewForElement: and elementForView:

        * WebCoreSupport.subproj/WebBridge.m:
        (-[WebBridge textField:doCommandBySelector:]):
        changed signature to pass along DOMElement* rather than NSView*

        * WebView.subproj/WebFormDelegate.h:
        * WebView.subproj/WebFormDelegate.m:
        (-[WebFormDelegate textField:doCommandBySelector:inFrame:]):
        ditto

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 50344ba..a1c3095 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,22 @@
 2005-07-26  John Sullivan  <sullivan@apple.com>
 
+        Reviewed by Chris Blumenberg.
+
+        Test cases added: none, only affects Safari autofill
+        
+        - more work to wean form-related SPI from NSView. All that's left (but this is a big "all")
+        is viewForElement: and elementForView:
+
+        * kwq/WebCoreBridge.h:
+        Rename control:textView:doCommandBySelector: to textField:doCommandBySelector:, and changed
+        to take DOMHTMLInputElement* rather than NSControl* and NSTextView*
+
+        * kwq/KWQTextField.mm:
+        (-[KWQTextFieldController control:textView:doCommandBySelector:]):
+        call renamed bridge method, passing DOMElement* instead of NSView*
+
+2005-07-26  John Sullivan  <sullivan@apple.com>
+
         Reviewed by Darin Adler.
 
         Test cases added: none, only affects Safari autofill

diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index af85b1c..2283729 100644 (file)
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -225,7 +225,7 @@
        return NO;
     
     WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
-    return [bridge control:control textView:textView doCommandBySelector:commandSelector];
+    return [bridge textField:(DOMHTMLInputElement *)[bridge elementForView:field] doCommandBySelector:commandSelector];
 }
 
 - (void)textChanged

diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 423bd71..51aa002 100644 (file)
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -591,7 +591,7 @@ typedef enum
 - (void)textDidChangeInTextField:(DOMHTMLInputElement *)element;
 - (void)textDidChangeInTextArea:(DOMHTMLTextAreaElement *)element;
 
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector;
+- (BOOL)textField:(DOMHTMLInputElement *)element doCommandBySelector:(SEL)commandSelector;
 - (BOOL)textField:(DOMHTMLInputElement *)element shouldHandleEvent:(NSEvent *)event;
 
 - (NSView <WebCoreFileButton> *)fileButtonWithDelegate:(id <WebCoreFileButtonDelegate>)delegate;

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 43da46a..36de79e 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2005-07-26  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Chris Blumenberg.
+        
+        - more work to wean form-related SPI from NSView. All that's left (but this is a big "all")
+        is viewForElement: and elementForView:        
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge textField:doCommandBySelector:]):
+        changed signature to pass along DOMElement* rather than NSView*
+        
+        * WebView.subproj/WebFormDelegate.h:
+        * WebView.subproj/WebFormDelegate.m:
+        (-[WebFormDelegate textField:doCommandBySelector:inFrame:]):
+        ditto
+
 2005-07-25  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 54274a0..8458057 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1253,10 +1253,10 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
     [formDelegate(self) textDidChangeInTextArea:element inFrame:_frame];
 }
 
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector
+- (BOOL)textField:(DOMHTMLInputElement *)element doCommandBySelector:(SEL)commandSelector
 {
-    FormDelegateLog(control);
-    return [formDelegate(self) control:control textView:textView doCommandBySelector:commandSelector inFrame:_frame];
+    FormDelegateLog(element);
+    return [formDelegate(self) textField:element doCommandBySelector:commandSelector inFrame:_frame];
 }
 
 - (BOOL)textField:(DOMHTMLInputElement *)element shouldHandleEvent:(NSEvent *)event

diff --git a/WebKit/WebView.subproj/WebFormDelegate.h b/WebKit/WebView.subproj/WebFormDelegate.h
index 99883cc..2a3d518 100644 (file)
--- a/WebKit/WebView.subproj/WebFormDelegate.h
+++ b/WebKit/WebView.subproj/WebFormDelegate.h
@@ -61,7 +61,7 @@
 - (void)textDidChangeInTextField:(DOMHTMLInputElement *)element inFrame:(WebFrame *)frame;
 - (void)textDidChangeInTextArea:(DOMHTMLTextAreaElement *)element inFrame:(WebFrame *)frame;
 
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector inFrame:(WebFrame *)frame;
+- (BOOL)textField:(DOMHTMLInputElement *)element doCommandBySelector:(SEL)commandSelector inFrame:(WebFrame *)frame;
 - (BOOL)textField:(DOMHTMLInputElement *)element shouldHandleEvent:(NSEvent *)event inFrame:(WebFrame *)frame;
 
 // Sent when a form is just about to be submitted (before the load is started)

diff --git a/WebKit/WebView.subproj/WebFormDelegate.m b/WebKit/WebView.subproj/WebFormDelegate.m
index 81e0052..c64ab38 100644 (file)
--- a/WebKit/WebView.subproj/WebFormDelegate.m
+++ b/WebKit/WebView.subproj/WebFormDelegate.m
@@ -53,7 +53,7 @@ static WebFormDelegate *sharedDelegate = nil;
 
 - (void)textDidChangeInTextArea:(DOMHTMLTextAreaElement *)element inFrame:(WebFrame *)frame { }
 
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector inFrame:(WebFrame *)frame
+- (BOOL)textField:(DOMHTMLInputElement *)element doCommandBySelector:(SEL)commandSelector inFrame:(WebFrame *)frame
 {
     return NO;
 }