[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 ba021ece0aee3510ffc1029ab4f7f5f7b98e6389
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 2 23:22:00 2003 +0000

            Reviewed by Maciej and Trey.
    
    	- fixed 3138063 -- REGRESSION: JavaScript-submitted form activates input type=image (webmail.mac.com)
    
    	JavaScript-submitted forms must not get a submit button activated as return-key-submitted ones do.
    
            * khtml/html/html_formimpl.h: Add boolean activateSubmitButton parameter to submit.
            * khtml/html/html_formimpl.cpp:
            (HTMLFormElementImpl::prepareSubmit): Pass true for activateSubmitButton.
            (HTMLFormElementImpl::submit): Only activate a button if activateSubmitButton is true.
    
            * khtml/dom/html_form.cpp: (HTMLFormElement::submit): Pass false for activateSubmitButton.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5a6aacf..b6aab66 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-01-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej and Trey.
+
+	- fixed 3138063 -- REGRESSION: JavaScript-submitted form activates input type=image (webmail.mac.com)
+
+	JavaScript-submitted forms must not get a submit button activated as return-key-submitted ones do.
+
+        * khtml/html/html_formimpl.h: Add boolean activateSubmitButton parameter to submit.
+        * khtml/html/html_formimpl.cpp:
+        (HTMLFormElementImpl::prepareSubmit): Pass true for activateSubmitButton.
+        (HTMLFormElementImpl::submit): Only activate a button if activateSubmitButton is true.
+
+        * khtml/dom/html_form.cpp: (HTMLFormElement::submit): Pass false for activateSubmitButton.
+
 2003-01-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for the 3137790.   This patch passes the mouse event x and y as 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5a6aacf..b6aab66 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-01-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej and Trey.
+
+	- fixed 3138063 -- REGRESSION: JavaScript-submitted form activates input type=image (webmail.mac.com)
+
+	JavaScript-submitted forms must not get a submit button activated as return-key-submitted ones do.
+
+        * khtml/html/html_formimpl.h: Add boolean activateSubmitButton parameter to submit.
+        * khtml/html/html_formimpl.cpp:
+        (HTMLFormElementImpl::prepareSubmit): Pass true for activateSubmitButton.
+        (HTMLFormElementImpl::submit): Only activate a button if activateSubmitButton is true.
+
+        * khtml/dom/html_form.cpp: (HTMLFormElement::submit): Pass false for activateSubmitButton.
+
 2003-01-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for the 3137790.   This patch passes the mouse event x and y as 
diff --git a/WebCore/khtml/dom/html_form.cpp b/WebCore/khtml/dom/html_form.cpp
index a0d0158..f93c1c8 100644
--- a/WebCore/khtml/dom/html_form.cpp
+++ b/WebCore/khtml/dom/html_form.cpp
@@ -275,7 +275,7 @@ void HTMLFormElement::setTarget( const DOMString &value )
 
 void HTMLFormElement::submit(  )
 {
-    if(impl) static_cast<HTMLFormElementImpl*>(impl)->submit(  );
+    if(impl) static_cast<HTMLFormElementImpl*>(impl)->submit( false );
 }
 
 void HTMLFormElement::reset(  )
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 5becfb9..ae08d23 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -407,12 +407,12 @@ bool HTMLFormElementImpl::prepareSubmit()
     m_insubmit = false;
 
     if ( m_doingsubmit )
-        submit();
+        submit(true);
 
     return m_doingsubmit;
 }
 
-void HTMLFormElementImpl::submit(  )
+void HTMLFormElementImpl::submit( bool activateSubmitButton )
 {
     if ( m_insubmit ) {
         m_doingsubmit = true;
@@ -426,7 +426,7 @@ void HTMLFormElementImpl::submit(  )
 #endif
 
     HTMLGenericFormElementImpl* firstSuccessfulSubmitButton = 0;
-    bool needButtonActivation = true;	// do we need to activate a submit button?
+    bool needButtonActivation = activateSubmitButton;	// do we need to activate a submit button?
     
     KHTMLView *view = getDocument()->view();
     for (QPtrListIterator<HTMLGenericFormElementImpl> it(formElements); it.current(); ++it) {
diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index f378b94..9b9a216 100644
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -91,7 +91,7 @@ public:
     void removeFormElement(HTMLGenericFormElementImpl *);
 
     bool prepareSubmit();
-    void submit();
+    void submit(bool activateSubmitButton);
     void reset();
 
     void setMalformed(bool malformed) { m_malformed = malformed; }

-- 
WebKit Debian packaging