Changeset 61152 in webkit

Timestamp:

Jun 14, 2010 2:51:28 PM (14 years ago)

Author:

Dimitri Glazkov

Message:

2010-06-14 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Refactor form submission code in HTMLFormElement to add clarity.
​https://bugs.webkit.org/show_bug.cgi?id=39430

Covered by existing tests in fast/forms/mailto.

• html/HTMLFormElement.cpp: (WebCore::appendMailtoPostFormDataToURL): Renamed from transferMailtoPostFormDataToUrl,

removed clearing out of the FormData and moved it to a new place (next to the call site).

(WebCore::HTMLFormElement::prepareFormData): Renamed from createFormData, moved the logic of

prepareing FormData here, including the use of appendMailtoPostFormDataToURL.

(WebCore::HTMLFormElement::submit): Consolidated multiple invocations of submitForm().

• html/HTMLFormElement.h: Renamed createFormData to prepareFormData.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLFormElement.cpp (modified) (4 diffs)
• html/HTMLFormElement.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-14  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Refactor form submission code in HTMLFormElement to add clarity.
+        https://bugs.webkit.org/show_bug.cgi?id=39430
+
+        Covered by existing tests in fast/forms/mailto.
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::appendMailtoPostFormDataToURL): Renamed from transferMailtoPostFormDataToUrl,
+            removed clearing out of the FormData and moved it to a new place (next to the call site).
+        (WebCore::HTMLFormElement::prepareFormData): Renamed from createFormData, moved the logic of
+            prepareing FormData here, including the use of appendMailtoPostFormDataToURL.
+        (WebCore::HTMLFormElement::submit): Consolidated multiple invocations of submitForm().
+        * html/HTMLFormElement.h: Renamed createFormData to prepareFormData.
+
 2010-06-14  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/html/HTMLFormElement.cpp

@@ -201 +201 @@
 }
 
-PassRefPtr<FormData> HTMLFormElement::createFormData()
-{
+static void appendMailtoPostFormDataToURL(KURL& url, const FormData& data, const String& encodingType)
+{
+    String body = data.flattenToString();
+
+    if (equalIgnoringCase(encodingType, "text/plain")) {
+        // Convention seems to be to decode, and s/&/\r\n/. Also, spaces are encoded as %20.
+        body = decodeURLEscapeSequences(body.replace('&', "\r\n").replace('+', ' ') + "\r\n");
+    }
+
+    Vector<char> bodyData;
+    bodyData.append("body=", 5);
+    FormDataBuilder::encodeStringAsFormData(bodyData, body.utf8());
+    body = String(bodyData.data(), bodyData.size()).replace('+', "%20");
+
+    String query = url.query();
+    if (!query.isEmpty())
+        query.append('&');
+    query.append(body);
+    url.setQuery(query);
+}
+
+PassRefPtr<FormData> HTMLFormElement::prepareFormData()
+{
+    if (m_formDataBuilder.isPostMethod()) {
+        if (m_formDataBuilder.isMultiPartForm() && isMailtoForm()) {
+            // FIXME: This may fire a DOM Mutation Event. Do we really want this here?
+            setEnctype("application/x-www-form-urlencoded");
+            ASSERT(!m_formDataBuilder.isMultiPartForm());
+        }
+    } else
+        m_formDataBuilder.setIsMultiPartForm(false);
+
     RefPtr<DOMFormData> domFormData = DOMFormData::create(dataEncoding().encodingForFormSubmission());
     for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
@@ -210 +240 @@
     }
 
-    RefPtr<FormData> result = (m_formDataBuilder.isMultiPartForm()) ? FormData::createMultiPart(domFormData->items(), domFormData->encoding(), document()) : FormData::create(domFormData->items(), domFormData->encoding());
+    RefPtr<FormData> result;
+
+    if (m_formDataBuilder.isMultiPartForm())
+        result = FormData::createMultiPart(domFormData->items(), domFormData->encoding(), document());
+    else {
+        result = FormData::FormData::create(domFormData->items(), domFormData->encoding());
+        if (m_formDataBuilder.isPostMethod() && isMailtoForm()) {
+            // Convert the form data into a string that we put into the URL.
+            KURL url = document()->completeURL(m_url);
+            appendMailtoPostFormDataToURL(url, *result, m_formDataBuilder.encodingType());
+            m_url = url.string();
+
+            result = FormData::create();
+        }
+    }
 
     result->setIdentifier(generateFormDataIdentifier());
-    return result;
+    return result.release();
 }
 
@@ -305 +349 @@
 }
 
-static void transferMailtoPostFormDataToURL(RefPtr<FormData>& data, KURL& url, const String& encodingType)
-{
-    String body = data->flattenToString();
-    data = FormData::create();
-
-    if (equalIgnoringCase(encodingType, "text/plain")) {
-        // Convention seems to be to decode, and s/&/\r\n/. Also, spaces are encoded as %20.
-        body = decodeURLEscapeSequences(body.replace('&', "\r\n").replace('+', ' ') + "\r\n");
-    }
-
-    Vector<char> bodyData;
-    bodyData.append("body=", 5);
-    FormDataBuilder::encodeStringAsFormData(bodyData, body.utf8());
-    body = String(bodyData.data(), bodyData.size()).replace('+', "%20");
-
-    String query = url.query();
-    if (!query.isEmpty())
-        query.append('&');
-    query.append(body);
-    url.setQuery(query);
-}
-
 void HTMLFormElement::submit(Frame* javaScriptActiveFrame)
 {
@@ -380 +402 @@
         m_url = document()->url().string();
 
-    if (m_formDataBuilder.isPostMethod()) {
-        if (m_formDataBuilder.isMultiPartForm() && isMailtoForm()) {
-            setEnctype("application/x-www-form-urlencoded");
-            ASSERT(!m_formDataBuilder.isMultiPartForm());
-        }
-
-        RefPtr<FormData> data = createFormData();
-        if (!m_formDataBuilder.isMultiPartForm()) {
-
-            if (isMailtoForm()) {
-                // Convert the form data into a string that we put into the URL.
-                KURL url = document()->completeURL(m_url);
-                transferMailtoPostFormDataToURL(data, url, m_formDataBuilder.encodingType());
-                m_url = url.string();
-            }
-
-            frame->loader()->submitForm("POST", m_url, data.release(), m_target, m_formDataBuilder.encodingType(), String(), lockHistory, event, formState.release());
-        } else
-            frame->loader()->submitForm("POST", m_url, data.get(), m_target, m_formDataBuilder.encodingType(), data->boundary().data(), lockHistory, event, formState.release());
-    } else {
-        m_formDataBuilder.setIsMultiPartForm(false);
-        frame->loader()->submitForm("GET", m_url, createFormData(), m_target, String(), String(), lockHistory, event, formState.release());
-    }
+    RefPtr<FormData> data = prepareFormData();
+    String boundary = m_formDataBuilder.isMultiPartForm() ? data->boundary().data() : String();
+    const char* method = m_formDataBuilder.isPostMethod() ? "POST" : "GET";
+    frame->loader()->submitForm(method, m_url, data.release(), m_target, m_formDataBuilder.encodingType(), boundary, lockHistory, event, formState.release());
 
     if (needButtonActivation && firstSuccessfulSubmitButton)

trunk/WebCore/html/HTMLFormElement.h

@@ -138 +138 @@
     bool isMailtoForm() const;
     TextEncoding dataEncoding() const;
-    PassRefPtr<FormData> createFormData();
+    PassRefPtr<FormData> prepareFormData();
     unsigned formElementIndex(HTMLFormControlElement*);
     // Returns true if the submission should be proceeded.