Bug 1728537 - Part 2: Move RestoreState out of nsIFormControl; r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D124180

dom/html/HTMLButtonElement.h

@@ -41,11 +41,11 @@ class HTMLButtonElement final : public nsGenericHTMLFormElementWithState,
 
   // nsGenericHTMLFormElement
   void SaveState() override;
+  bool RestoreState(PresState* aState) override;
 
   // overriden nsIFormControl methods
   NS_IMETHOD Reset() override;
   NS_IMETHOD SubmitNamesValues(FormData* aFormData) override;
-  bool RestoreState(PresState* aState) override;
   virtual bool IsDisabledForEvents(WidgetEvent* aEvent) override;
 
   virtual void FieldSetDisabledChanged(bool aNotify) override;

dom/html/HTMLInputElement.h

@@ -148,6 +148,7 @@ class HTMLInputElement final : public TextControlElement,
 
   // nsGenericHTMLFormElement
   void SaveState() override;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY bool RestoreState(PresState* aState) override;
 
   // EventTarget
   virtual void AsyncEventRunning(AsyncEventDispatcher* aEvent) override;
@@ -156,8 +157,6 @@ class HTMLInputElement final : public TextControlElement,
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   NS_IMETHOD Reset() override;
   NS_IMETHOD SubmitNamesValues(FormData* aFormData) override;
-  MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  virtual bool RestoreState(PresState* aState) override;
   virtual bool AllowDrop() override;
   virtual bool IsDisabledForEvents(WidgetEvent* aEvent) override;
 

dom/html/HTMLSelectElement.cpp

@@ -1282,8 +1282,6 @@ void HTMLSelectElement::SaveState() {
   }
 }
 
-// nsIFormControl
-
 bool HTMLSelectElement::RestoreState(PresState* aState) {
   // Get the presentation state object to retrieve our stuff out of.
   const PresContentData& state = aState->contentData();
@@ -1335,6 +1333,8 @@ void HTMLSelectElement::RestoreStateTo(const SelectContentData& aNewSelected) {
   }
 }
 
+// nsIFormControl
+
 NS_IMETHODIMP
 HTMLSelectElement::Reset() {
   uint32_t numSelected = 0;

dom/html/HTMLSelectElement.h

@@ -202,11 +202,11 @@ class HTMLSelectElement final : public nsGenericHTMLFormElementWithState,
 
   // nsGenericHTMLFormElement
   void SaveState() override;
+  bool RestoreState(PresState* aState) override;
 
   // Overriden nsIFormControl methods
   NS_IMETHOD Reset() override;
   NS_IMETHOD SubmitNamesValues(FormData* aFormData) override;
-  virtual bool RestoreState(PresState* aState) override;
   virtual bool IsDisabledForEvents(WidgetEvent* aEvent) override;
 
   virtual void FieldSetDisabledChanged(bool aNotify) override;

dom/html/HTMLTextAreaElement.h

@@ -58,12 +58,12 @@ class HTMLTextAreaElement final : public TextControlElement,
 
   // nsGenericHTMLFormElement
   void SaveState() override;
+  bool RestoreState(PresState* aState) override;
 
   // nsIFormControl
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   NS_IMETHOD Reset() override;
   NS_IMETHOD SubmitNamesValues(FormData* aFormData) override;
-  virtual bool RestoreState(PresState* aState) override;
   virtual bool IsDisabledForEvents(WidgetEvent* aEvent) override;
 
   virtual void FieldSetDisabledChanged(bool aNotify) override;

dom/html/nsGenericHTMLElement.h

@@ -975,9 +975,6 @@ class nsGenericHTMLFormElement : public nsGenericHTMLElement,
   virtual void SetForm(mozilla::dom::HTMLFormElement* aForm) override;
   virtual void ClearForm(bool aRemoveFromForm, bool aUnbindOrDelete) override;
 
-  virtual bool RestoreState(mozilla::PresState* aState) override {
-    return false;
-  }
   virtual bool AllowDrop() override { return true; }
 
   // nsIContent
@@ -997,6 +994,17 @@ class nsGenericHTMLFormElement : public nsGenericHTMLElement,
    */
   virtual void SaveState() {}
 
+  /**
+   * Restore from presentation state.  You pass in the presentation state for
+   * this form control (generated with GenerateStateKey() + "-C") and the form
+   * control will grab its state from there.
+   *
+   * @param aState the pres state to use to restore the control
+   * @return true if the form control was a checkbox and its
+   *         checked state was restored, false otherwise.
+   */
+  virtual bool RestoreState(mozilla::PresState* aState) { return false; }
+
   /**
    * This callback is called by a fieldest on all its elements whenever its
    * disabled attribute is changed so the element knows its disabled state

dom/html/nsIFormControl.h

@@ -146,17 +146,6 @@ class nsIFormControl : public nsISupports {
   NS_IMETHOD
   SubmitNamesValues(mozilla::dom::FormData* aFormData) = 0;
 
-  /**
-   * Restore from presentation state.  You pass in the presentation state for
-   * this form control (generated with GenerateStateKey() + "-C") and the form
-   * control will grab its state from there.
-   *
-   * @param aState the pres state to use to restore the control
-   * @return true if the form control was a checkbox and its
-   *         checked state was restored, false otherwise.
-   */
-  virtual bool RestoreState(mozilla::PresState* aState) = 0;
-
   virtual bool AllowDrop() = 0;
 
   /**