[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 e2da7b5b85aa77df39380b9c36a318d1baccd91b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 29 15:59:41 2003 +0000

            Reviewed by John.
    
    	- fixed 3269564 -- dynamically-created forms look right, but don't post values when submitted
    
            * khtml/html/html_formimpl.h: Remove useless virtual setParent function.
            Since the inherited setParent is not virtual, it does no good to make the subclass
            override it with a virtual function.
            * khtml/html/html_formimpl.cpp: Remove useless virtual setParent.
            (HTMLGenericFormElementImpl::attach): Add code here, cribbed from setParent, to add
            a new form element to the form it's in.
            (HTMLButtonElementImpl::attach): A copy of the code is also needed here.
    
            * WebCore.pbproj/project.pbxproj: Let Project Builder be Project Builder.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1bcac69..e385c00 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-05-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3269564 -- dynamically-created forms look right, but don't post values when submitted
+
+        * khtml/html/html_formimpl.h: Remove useless virtual setParent function.
+        Since the inherited setParent is not virtual, it does no good to make the subclass
+        override it with a virtual function.
+        * khtml/html/html_formimpl.cpp: Remove useless virtual setParent.
+        (HTMLGenericFormElementImpl::attach): Add code here, cribbed from setParent, to add
+        a new form element to the form it's in.
+        (HTMLButtonElementImpl::attach): A copy of the code is also needed here.
+
+        * WebCore.pbproj/project.pbxproj: Let Project Builder be Project Builder.
+
 2003-05-28  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1bcac69..e385c00 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-05-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3269564 -- dynamically-created forms look right, but don't post values when submitted
+
+        * khtml/html/html_formimpl.h: Remove useless virtual setParent function.
+        Since the inherited setParent is not virtual, it does no good to make the subclass
+        override it with a virtual function.
+        * khtml/html/html_formimpl.cpp: Remove useless virtual setParent.
+        (HTMLGenericFormElementImpl::attach): Add code here, cribbed from setParent, to add
+        a new form element to the form it's in.
+        (HTMLButtonElementImpl::attach): A copy of the code is also needed here.
+
+        * WebCore.pbproj/project.pbxproj: Let Project Builder be Project Builder.
+
 2003-05-28  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index fd25734..d83ea3d 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -179,7 +179,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 7dd7e27..ebe95f0 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -693,6 +693,19 @@ void HTMLGenericFormElementImpl::attach()
 {
     assert(!attached());
 
+    // FIXME: This handles the case of a new form element being created by
+    // JavaScript and inserted inside a form. What it does not handle is
+    // a form element being moved from inside a form to outside, or from one
+    // inside one form to another. The reason this other case is hard to fix
+    // is that during parsing, we may have been passed a form that we are not
+    // inside, DOM-tree-wise. If so, it's hard for us to know when we should
+    // be removed from that form's element list.
+    if (!m_form) {
+	m_form = getForm();
+	if (m_form)
+	    m_form->registerFormElement(this);
+    }
+
     NodeBaseImpl::attach();
 
     // The call to updateFromElement() needs to go after the call through
@@ -758,21 +771,6 @@ void HTMLGenericFormElementImpl::setDisabled( bool _disabled )
     }
 }
 
-void HTMLGenericFormElementImpl::setParent(NodeImpl *parent)
-{
-    if (parentNode()) { // false on initial insert, we use the form given by the parser
-	if (m_form)
-	    m_form->removeFormElement(this);
-	m_form = 0;
-    }
-    HTMLElementImpl::setParent(parent);
-    if (!m_form) {
-	m_form = getForm();
-	if (m_form)
-	    m_form->registerFormElement(this);
-    }
-}
-
 void HTMLGenericFormElementImpl::recalcStyle( StyleChange ch )
 {
     //bool changed = changed();
@@ -966,6 +964,17 @@ void HTMLButtonElementImpl::parseAttribute(AttributeImpl *attr)
 
 void HTMLButtonElementImpl::attach()
 {
+    // FIXME: This code is repeated here because this method does not call
+    // HTMLGenericFormElementImpl::attach(). But it's not clear why the call
+    // to updateFromElement() is a problem for the HTMLButtonElementImpl case.
+    // If we determine that it's not, then we should remove this and call
+    // HTMLGenericFormElementImpl::attach() instead of HTMLElementImpl::attach().
+    if (!m_form) {
+	m_form = getForm();
+	if (m_form)
+	    m_form->registerFormElement(this);
+    }
+
     // skip the generic handler
     HTMLElementImpl::attach();
     // doesn't work yet in the renderer ### fixme
diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index 5843340..85b1b58 100644
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -166,8 +166,6 @@ public:
      */
     virtual bool encoding(const QTextCodec*, khtml::encodingList&, bool) { return false; }
 
-    virtual void setParent(NodeImpl *parent);
-
     virtual void defaultEventHandler(EventImpl *evt);
     virtual bool isEditable();
 

-- 
WebKit Debian packaging