From 6f89091771531e91f7c5e9ffcc4f302b9a64e812 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Thu, 16 Jun 2016 08:25:48 +0100
Subject: [PATCH] Bug 1279860 - part 3 - HTMLFormSubmission::GetFromForm,
 r=smaug

---
 dom/html/HTMLFormElement.cpp    |  3 ++-
 dom/html/HTMLFormSubmission.cpp |  8 ++++----
 dom/html/HTMLFormSubmission.h   | 24 +++++++++++++-----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dom/html/HTMLFormElement.cpp b/dom/html/HTMLFormElement.cpp
index 9b30636a29d1..4c55f8f2a763 100644
--- a/dom/html/HTMLFormElement.cpp
+++ b/dom/html/HTMLFormElement.cpp
@@ -709,7 +709,8 @@ HTMLFormElement::BuildSubmission(HTMLFormSubmission** aFormSubmission,
   //
   // Get the submission object
   //
-  rv = GetSubmissionFromForm(this, originatingElement, aFormSubmission);
+  rv = HTMLFormSubmission::GetFromForm(this, originatingElement,
+                                       aFormSubmission);
   NS_ENSURE_SUBMIT_SUCCESS(rv);
 
   //
diff --git a/dom/html/HTMLFormSubmission.cpp b/dom/html/HTMLFormSubmission.cpp
index 9ad33f2bd4e3..dac693fc99e8 100644
--- a/dom/html/HTMLFormSubmission.cpp
+++ b/dom/html/HTMLFormSubmission.cpp
@@ -812,10 +812,10 @@ GetEnumAttr(nsGenericHTMLElement* aContent,
 
 } // anonymous namespace
 
-nsresult
-GetSubmissionFromForm(nsGenericHTMLElement* aForm,
-                      nsGenericHTMLElement* aOriginatingElement,
-                      HTMLFormSubmission** aFormSubmission)
+/* static */ nsresult
+HTMLFormSubmission::GetFromForm(nsGenericHTMLElement* aForm,
+                                nsGenericHTMLElement* aOriginatingElement,
+                                HTMLFormSubmission** aFormSubmission)
 {
   // Get all the information necessary to encode the form data
   NS_ASSERTION(aForm->GetComposedDoc(),
diff --git a/dom/html/HTMLFormSubmission.h b/dom/html/HTMLFormSubmission.h
index 3a66b2a726f4..295599049267 100644
--- a/dom/html/HTMLFormSubmission.h
+++ b/dom/html/HTMLFormSubmission.h
@@ -30,6 +30,19 @@ class Blob;
 class HTMLFormSubmission
 {
 public:
+  /**
+   * Get a submission object based on attributes in the form (ENCTYPE and
+   * METHOD)
+   *
+   * @param aForm the form to get a submission object based on
+   * @param aOriginatingElement the originating element (can be null)
+   * @param aFormSubmission the form submission object (out param)
+   */
+  static nsresult
+  GetFromForm(nsGenericHTMLElement* aForm,
+              nsGenericHTMLElement* aOriginatingElement,
+              HTMLFormSubmission** aFormSubmission);
+
   virtual ~HTMLFormSubmission()
   {
     MOZ_COUNT_DTOR(HTMLFormSubmission);
@@ -212,17 +225,6 @@ private:
   uint64_t mTotalLength;
 };
 
-/**
- * Get a submission object based on attributes in the form (ENCTYPE and METHOD)
- *
- * @param aForm the form to get a submission object based on
- * @param aOriginatingElement the originating element (can be null)
- * @param aFormSubmission the form submission object (out param)
- */
-nsresult GetSubmissionFromForm(nsGenericHTMLElement* aForm,
-                               nsGenericHTMLElement* aOriginatingElement,
-                               HTMLFormSubmission** aFormSubmission);
-
 } // namespace dom
 } // namespace mozilla