Reviewed by Darin.

	<rdar://problem/3805137> REGRESSION: Cannot search on pricetool.com

        The problem here is that residual style handling can cause an
	element associated with a misnested form to lose the association,
	because it can become detached and then reattached in this
	case. So we need to maintain the association.

        * khtml/html/html_formimpl.h: Added list of dormant elements to form,
	and dormant bit to generic form element.
	* khtml/html/html_formimpl.cpp:
        (DOM::HTMLFormElementImpl::~HTMLFormElementImpl): Clear m_form field for
	dormant elements too.
        (DOM::HTMLFormElementImpl::registerFormElement): Remove from dormant list
	in addition to adding to main list.
        (DOM::HTMLFormElementImpl::removeFormElement): Remove from both lists.
        (DOM::HTMLFormElementImpl::makeFormElementDormant): New method, remove from
	main list, add to dormant list.
        (DOM::HTMLGenericFormElementImpl::HTMLGenericFormElementImpl): Initialize
	dormant bit to false.
        (DOM::HTMLGenericFormElementImpl::insertedIntoDocument): If the element is
	dormant and has a form, re-register it and clear the dormant bit.
        (DOM::HTMLGenericFormElementImpl::removedFromDocument): If the document has
	a form, tell the form it is dormant and set the dormant bit.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 783451f695a39d18c2250a77fe92f98f869e9715..960b62addbf8da2f0b59bb2d89732db308200be7 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,31 @@
+2004-09-21  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+       <rdar://problem/3805137> REGRESSION: Cannot search on pricetool.com
+
+        The problem here is that residual style handling can cause an
+       element associated with a misnested form to lose the association,
+       because it can become detached and then reattached in this
+       case. So we need to maintain the association.
+       
+        * khtml/html/html_formimpl.h: Added list of dormant elements to form,
+       and dormant bit to generic form element.
+       * khtml/html/html_formimpl.cpp:
+        (DOM::HTMLFormElementImpl::~HTMLFormElementImpl): Clear m_form field for
+       dormant elements too.
+        (DOM::HTMLFormElementImpl::registerFormElement): Remove from dormant list
+       in addition to adding to main list.
+        (DOM::HTMLFormElementImpl::removeFormElement): Remove from both lists.
+        (DOM::HTMLFormElementImpl::makeFormElementDormant): New method, remove from
+       main list, add to dormant list.
+        (DOM::HTMLGenericFormElementImpl::HTMLGenericFormElementImpl): Initialize
+       dormant bit to false.
+        (DOM::HTMLGenericFormElementImpl::insertedIntoDocument): If the element is
+       dormant and has a form, re-register it and clear the dormant bit.
+        (DOM::HTMLGenericFormElementImpl::removedFromDocument): If the document has
+       a form, tell the form it is dormant and set the dormant bit.
+
 2004-09-22  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3811187> REGRESSION (Mail): Control-click past end of document does not spell check last word

diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index ce631ea5a1e278ce5de09ca9fef5dbda182d3124..04df46f6bb86faa26bcd65f99605f87174241b53 100644 (file)
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -112,6 +112,9 @@ HTMLFormElementImpl::~HTMLFormElementImpl()
     QPtrListIterator<HTMLGenericFormElementImpl> it(formElements);
     for (; it.current(); ++it)
         it.current()->m_form = 0;
+    QPtrListIterator<HTMLGenericFormElementImpl> it2(dormantFormElements);
+    for (; it2.current(); ++it2)
+        it2.current()->m_form = 0;
 }
 
 NodeImpl::Id HTMLFormElementImpl::id() const
@@ -697,11 +700,19 @@ void HTMLFormElementImpl::radioClicked( HTMLGenericFormElementImpl *caller )
 void HTMLFormElementImpl::registerFormElement(HTMLGenericFormElementImpl *e)
 {
     formElements.append(e);
+    dormantFormElements.remove(e);
 }
 
 void HTMLFormElementImpl::removeFormElement(HTMLGenericFormElementImpl *e)
 {
     formElements.remove(e);
+    dormantFormElements.remove(e);
+}
+
+void HTMLFormElementImpl::makeFormElementDormant(HTMLGenericFormElementImpl *e)
+{
+    dormantFormElements.append(e);
+    formElements.remove(e);
 }
 
 bool HTMLFormElementImpl::isURLAttribute(AttributeImpl *attr) const
@@ -716,6 +727,7 @@ HTMLGenericFormElementImpl::HTMLGenericFormElementImpl(DocumentPtr *doc, HTMLFor
 {
     m_disabled = m_readOnly = false;
     m_name = 0;
+    m_dormant = false;
 
     if (f)
        m_form = f;
@@ -788,11 +800,22 @@ void HTMLGenericFormElementImpl::attach()
     }
 }
 
+void HTMLGenericFormElementImpl::insertedIntoDocument()
+{
+    if (m_form && m_dormant)
+        m_form->registerFormElement(this);
+
+    m_dormant = false;
+   
+    HTMLElementImpl::insertedIntoDocument();
+}
+
 void HTMLGenericFormElementImpl::removedFromDocument()
 {
     if (m_form)
-        m_form->removeFormElement(this);
-    m_form = 0;
+        m_form->makeFormElementDormant(this);
+
+    m_dormant = true;
    
     HTMLElementImpl::removedFromDocument();
 }

diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index 625ad596edb4f2f803098d6bbd92ba49b9e50c9f..1ad11ccc2884a726986f1161297f3429c0264f1c 100644 (file)
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -85,11 +85,9 @@ public:
 
     void radioClicked( HTMLGenericFormElementImpl *caller );
 
-    void registerFormElement(khtml::RenderFormElement *);
-    void removeFormElement(khtml::RenderFormElement *);
-
     void registerFormElement(HTMLGenericFormElementImpl *);
     void removeFormElement(HTMLGenericFormElementImpl *);
+    void makeFormElementDormant(HTMLGenericFormElementImpl *);
 
     bool prepareSubmit();
     void submit(bool activateSubmitButton);
@@ -111,6 +109,7 @@ public:
     friend class HTMLFormCollectionImpl;
 
     QPtrList<HTMLGenericFormElementImpl> formElements;
+    QPtrList<HTMLGenericFormElementImpl> dormantFormElements;
     DOMString m_url;
     DOMString m_target;
     DOMString m_enctype;
@@ -148,6 +147,7 @@ public:
 
     virtual void parseHTMLAttribute(HTMLAttributeImpl *attr);
     virtual void attach();
+    virtual void insertedIntoDocument();
     virtual void removedFromDocument();
 
     virtual void reset() {}
@@ -198,6 +198,7 @@ protected:
     bool m_disabled, m_readOnly;
 
     bool m_inited : 1;
+    bool m_dormant : 1;
 };
 
 // -------------------------------------------------------------------------