Backed out changeset 1680323680fe (bug 1556358) for causing Bb bustages on ElementInternals.cpp CLOSED TREE

dom/html/nsGenericHTMLElement.cpp

@@ -1833,9 +1833,6 @@ nsresult nsGenericHTMLFormElement::BindToTree(BindContext& aContext,
 }
 
 void nsGenericHTMLFormElement::UnbindFromTree(bool aNullParent) {
-  // Save state before doing anything else.
-  SaveState();
-
   if (IsFormAssociatedElement()) {
     if (HTMLFormElement* form = GetFormInternal()) {
       // Might need to unset form
@@ -2243,12 +2240,6 @@ void nsGenericHTMLFormElement::FieldSetDisabledChanged(bool aNotify) {
   UpdateDisabledState(aNotify);
 }
 
-void nsGenericHTMLFormElement::SaveSubtreeState() {
-  SaveState();
-
-  nsGenericHTMLElement::SaveSubtreeState();
-}
-
 //----------------------------------------------------------------------
 
 void nsGenericHTMLElement::Click(CallerType aCallerType) {
@@ -2582,6 +2573,12 @@ nsINode* nsGenericHTMLFormControlElement::GetScopeChainParent() const {
   return mForm ? mForm : nsGenericHTMLElement::GetScopeChainParent();
 }
 
+void nsGenericHTMLFormControlElement::SaveSubtreeState() {
+  SaveState();
+
+  nsGenericHTMLFormElement::SaveSubtreeState();
+}
+
 nsIContent::IMEState nsGenericHTMLFormControlElement::GetDesiredIMEState() {
   TextEditor* textEditor = GetTextEditorInternal();
   if (!textEditor) {
@@ -2595,6 +2592,12 @@ nsIContent::IMEState nsGenericHTMLFormControlElement::GetDesiredIMEState() {
   return state;
 }
 
+void nsGenericHTMLFormControlElement::UnbindFromTree(bool aNullParent) {
+  // Save state before doing anything
+  SaveState();
+  nsGenericHTMLFormElement::UnbindFromTree(aNullParent);
+}
+
 void nsGenericHTMLFormControlElement::GetAutocapitalize(
     nsAString& aValue) const {
   if (nsContentUtils::HasNonEmptyAttr(this, kNameSpaceID_None,
@@ -2959,7 +2962,7 @@ PresState* nsGenericHTMLFormControlElementWithState::GetPrimaryPresState() {
 }
 
 already_AddRefed<nsILayoutHistoryState>
-nsGenericHTMLFormElement::GetLayoutHistory(bool aRead) {
+nsGenericHTMLFormControlElementWithState::GetLayoutHistory(bool aRead) {
   nsCOMPtr<Document> doc = GetUncomposedDoc();
   if (!doc) {
     return nullptr;