Backed out 3 changesets (bug 1556358) for causing Bb build bustages in ElementInternals.cpp. CLOSED TREE

Backed out changeset f7e94ea82252 (bug 1556358)
Backed out changeset c80f29a9cefc (bug 1556358)
Backed out changeset 413225d91666 (bug 1556358)

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;