Revert 78166 - Merge r77114

WebCore/html/HTMLFormControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 144 matching lines @@
 void HTMLFormControlElement::willMoveToNewOwnerDocument()
 {
     if (fastHasAttribute(formAttr))
         document()->unregisterFormElementWithFormAttribute(this);
     HTMLElement::willMoveToNewOwnerDocument();
 }
 
 void HTMLFormControlElement::insertedIntoTree(bool deep)
 {
     if (fastHasAttribute(formAttr)) {
+        document()->registerFormElementWithFormAttribute(this);
         Element* element = document()->getElementById(fastGetAttribute(formAttr));
         if (element && element->hasTagName(formTag)) {
             if (m_form)
                 m_form->removeFormElement(this);
             m_form = static_cast<HTMLFormElement*>(element);
             m_form->registerFormElement(this);
         }
     }
     if (!m_form) {
         // This handles the case of a new form element being created by
@@ skipping 13 matching lines @@
 static inline Node* findRoot(Node* n)
 {
     Node* root = n;
     for (; n; n = n->parentNode())
         root = n;
     return root;
 }
 
 void HTMLFormControlElement::removedFromTree(bool deep)
 {
+    if (fastHasAttribute(formAttr))
+        document()->unregisterFormElementWithFormAttribute(this);
+
     // If the form and element are both in the same tree, preserve the connection to the form.
     // Otherwise, null out our form and remove ourselves from the form's list of elements.
     if (m_form && findRoot(this) != findRoot(m_form)) {
         m_form->removeFormElement(this);
         m_form = 0;
     }
 
     HTMLElement::removedFromTree(deep);
 }
 
-void HTMLFormControlElement::insertedIntoDocument()
-{
-    if (fastHasAttribute(formAttr))
-        document()->registerFormElementWithFormAttribute(this);
-}
-
-void HTMLFormControlElement::removedFromDocument()
-{
-    if (fastHasAttribute(formAttr))
-        document()->unregisterFormElementWithFormAttribute(this);
-}
-
 const AtomicString& HTMLFormControlElement::formControlName() const
 {
     const AtomicString& name = fastGetAttribute(nameAttr);
     return name.isNull() ? emptyAtom : name;
 }
 
 void HTMLFormControlElement::setName(const AtomicString& value)
 {
     setAttribute(nameAttr, value);
 }
@@ skipping 497 matching lines @@
         updatePlaceholderVisibility(true);
     else if (attr->name() == onselectAttr)
         setAttributeEventListener(eventNames().selectEvent, createAttributeEventListener(this, attr));
     else if (attr->name() == onchangeAttr)
         setAttributeEventListener(eventNames().changeEvent, createAttributeEventListener(this, attr));
     else
         HTMLFormControlElementWithState::parseMappedAttribute(attr);
 }
 
 } // namespace Webcore