Title: [286447] trunk/Source/WebCore
Revision
286447
Author
commit-qu...@webkit.org
Date
2021-12-02 13:13:02 -0800 (Thu, 02 Dec 2021)

Log Message

Remove the multipart parameter to FormAssociatedElement::appendFormData, InputType::appendFormData and HTMLFormElement::constructEntryList
https://bugs.webkit.org/show_bug.cgi?id=233774

Patch by Andreu Botella <and...@andreubotella.com> on 2021-12-02
Reviewed by Chris Dumez.

These parameters were only needed because of an optimization where file inputs were being
added to the DOMFormData as string values containing their filenames if the entry list was
being constructed to be used in a urlencoded or text/plain form submission. This
optimization was removed in r286427 and those parameters can now be dropped.

No behavior change.

* html/BaseButtonInputType.cpp:
(WebCore::BaseButtonInputType::appendFormData const):
* html/BaseButtonInputType.h:
* html/BaseCheckableInputType.cpp:
(WebCore::BaseCheckableInputType::appendFormData const):
* html/BaseCheckableInputType.h:
* html/DOMFormData.cpp:
(WebCore::DOMFormData::create):
* html/FileInputType.cpp:
(WebCore::FileInputType::appendFormData const):
* html/FileInputType.h:
* html/FormAssociatedElement.h:
(WebCore::FormAssociatedElement::appendFormData):
* html/HTMLButtonElement.cpp:
(WebCore::HTMLButtonElement::appendFormData):
* html/HTMLButtonElement.h:
* html/HTMLFormControlElement.h:
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::constructEntryList):
* html/HTMLFormElement.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::appendFormData):
* html/HTMLInputElement.h:
* html/HTMLKeygenElement.cpp:
(WebCore::HTMLKeygenElement::appendFormData):
* html/HTMLKeygenElement.h:
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::appendFormData):
* html/HTMLObjectElement.h:
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::appendFormData):
* html/HTMLSelectElement.h:
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::appendFormData):
* html/HTMLTextAreaElement.h:
* html/HiddenInputType.cpp:
(WebCore::HiddenInputType::appendFormData const):
* html/HiddenInputType.h:
* html/ImageInputType.cpp:
(WebCore::ImageInputType::appendFormData const):
* html/ImageInputType.h:
* html/InputType.cpp:
(WebCore::InputType::appendFormData const):
* html/InputType.h:
* html/SubmitInputType.cpp:
(WebCore::SubmitInputType::appendFormData const):
* html/SubmitInputType.h:
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::appendFormData const):
* html/TextFieldInputType.h:
* loader/FormSubmission.cpp:
(WebCore::FormSubmission::create):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (286446 => 286447)


--- trunk/Source/WebCore/ChangeLog	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/ChangeLog	2021-12-02 21:13:02 UTC (rev 286447)
@@ -1,3 +1,70 @@
+2021-12-02  Andreu Botella  <and...@andreubotella.com>
+
+        Remove the multipart parameter to FormAssociatedElement::appendFormData, InputType::appendFormData and HTMLFormElement::constructEntryList
+        https://bugs.webkit.org/show_bug.cgi?id=233774
+
+        Reviewed by Chris Dumez.
+
+        These parameters were only needed because of an optimization where file inputs were being
+        added to the DOMFormData as string values containing their filenames if the entry list was
+        being constructed to be used in a urlencoded or text/plain form submission. This
+        optimization was removed in r286427 and those parameters can now be dropped.
+
+        No behavior change.
+
+        * html/BaseButtonInputType.cpp:
+        (WebCore::BaseButtonInputType::appendFormData const):
+        * html/BaseButtonInputType.h:
+        * html/BaseCheckableInputType.cpp:
+        (WebCore::BaseCheckableInputType::appendFormData const):
+        * html/BaseCheckableInputType.h:
+        * html/DOMFormData.cpp:
+        (WebCore::DOMFormData::create):
+        * html/FileInputType.cpp:
+        (WebCore::FileInputType::appendFormData const):
+        * html/FileInputType.h:
+        * html/FormAssociatedElement.h:
+        (WebCore::FormAssociatedElement::appendFormData):
+        * html/HTMLButtonElement.cpp:
+        (WebCore::HTMLButtonElement::appendFormData):
+        * html/HTMLButtonElement.h:
+        * html/HTMLFormControlElement.h:
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::constructEntryList):
+        * html/HTMLFormElement.h:
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::appendFormData):
+        * html/HTMLInputElement.h:
+        * html/HTMLKeygenElement.cpp:
+        (WebCore::HTMLKeygenElement::appendFormData):
+        * html/HTMLKeygenElement.h:
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::appendFormData):
+        * html/HTMLObjectElement.h:
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::appendFormData):
+        * html/HTMLSelectElement.h:
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::appendFormData):
+        * html/HTMLTextAreaElement.h:
+        * html/HiddenInputType.cpp:
+        (WebCore::HiddenInputType::appendFormData const):
+        * html/HiddenInputType.h:
+        * html/ImageInputType.cpp:
+        (WebCore::ImageInputType::appendFormData const):
+        * html/ImageInputType.h:
+        * html/InputType.cpp:
+        (WebCore::InputType::appendFormData const):
+        * html/InputType.h:
+        * html/SubmitInputType.cpp:
+        (WebCore::SubmitInputType::appendFormData const):
+        * html/SubmitInputType.h:
+        * html/TextFieldInputType.cpp:
+        (WebCore::TextFieldInputType::appendFormData const):
+        * html/TextFieldInputType.h:
+        * loader/FormSubmission.cpp:
+        (WebCore::FormSubmission::create):
+
 2021-12-02  Alan Bujtas  <za...@apple.com>
 
         [LFC][IFC] Introduce createDisplayBoxesInVisualOrderForContentRuns

Modified: trunk/Source/WebCore/html/BaseButtonInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/BaseButtonInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/BaseButtonInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -45,7 +45,7 @@
     return false;
 }
 
-bool BaseButtonInputType::appendFormData(DOMFormData&, bool) const
+bool BaseButtonInputType::appendFormData(DOMFormData&) const
 {
     // Buttons except overridden types are never successful.
     return false;

Modified: trunk/Source/WebCore/html/BaseButtonInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/BaseButtonInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/BaseButtonInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -41,7 +41,7 @@
 
 private:
     bool shouldSaveAndRestoreFormControlState() const override;
-    bool appendFormData(DOMFormData&, bool) const override;
+    bool appendFormData(DOMFormData&) const override;
     RenderPtr<RenderElement> createInputRenderer(RenderStyle&&) override;
     bool storesValueSeparateFromAttribute() override;
     void setValue(const String&, bool, TextFieldEventBehavior) override;

Modified: trunk/Source/WebCore/html/BaseCheckableInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/BaseCheckableInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/BaseCheckableInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -55,7 +55,7 @@
     element()->setChecked(state[0] == "on");
 }
 
-bool BaseCheckableInputType::appendFormData(DOMFormData& formData, bool) const
+bool BaseCheckableInputType::appendFormData(DOMFormData& formData) const
 {
     ASSERT(element());
     if (!element()->checked())

Modified: trunk/Source/WebCore/html/BaseCheckableInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/BaseCheckableInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/BaseCheckableInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -44,7 +44,7 @@
 private:
     FormControlState saveFormControlState() const override;
     void restoreFormControlState(const FormControlState&) override;
-    bool appendFormData(DOMFormData&, bool) const override;
+    bool appendFormData(DOMFormData&) const override;
     void handleKeypressEvent(KeyboardEvent&) override;
     bool canSetStringValue() const override;
     bool accessKeyAction(bool sendMouseEvents) override;

Modified: trunk/Source/WebCore/html/DOMFormData.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/DOMFormData.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/DOMFormData.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -48,7 +48,7 @@
     if (!form)
         return formData;
     
-    auto result = form->constructEntryList(WTFMove(formData), nullptr, HTMLFormElement::IsMultipartForm::Yes);
+    auto result = form->constructEntryList(WTFMove(formData), nullptr);
     
     if (!result)
         return Exception { InvalidStateError, "Already constructing Form entry list."_s };

Modified: trunk/Source/WebCore/html/FileInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/FileInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/FileInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -158,7 +158,7 @@
     filesChosen(filesFromFormControlState(state));
 }
 
-bool FileInputType::appendFormData(DOMFormData& formData, bool) const
+bool FileInputType::appendFormData(DOMFormData& formData) const
 {
     ASSERT(element());
     RefPtr fileList = element()->files();

Modified: trunk/Source/WebCore/html/FileInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/FileInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/FileInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -56,7 +56,7 @@
     const AtomString& formControlType() const final;
     FormControlState saveFormControlState() const final;
     void restoreFormControlState(const FormControlState&) final;
-    bool appendFormData(DOMFormData&, bool) const final;
+    bool appendFormData(DOMFormData&) const final;
     bool valueMissing(const String&) const final;
     String valueMissingText() const final;
     void handleDOMActivateEvent(Event&) final;

Modified: trunk/Source/WebCore/html/FormAssociatedElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/FormAssociatedElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/FormAssociatedElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -62,7 +62,7 @@
 
     // Override in derived classes to get the encoded name=value pair for submitting.
     // Return true for a successful control (see HTML4-17.13.2).
-    virtual bool appendFormData(DOMFormData&, bool) { return false; }
+    virtual bool appendFormData(DOMFormData&) { return false; }
 
     void formWillBeDestroyed();
 

Modified: trunk/Source/WebCore/html/HTMLButtonElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLButtonElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLButtonElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -208,7 +208,7 @@
     m_isActivatedSubmit = flag;
 }
 
-bool HTMLButtonElement::appendFormData(DOMFormData& formData, bool)
+bool HTMLButtonElement::appendFormData(DOMFormData& formData)
 {
     if (m_type != SUBMIT || name().isEmpty() || !m_isActivatedSubmit)
         return false;

Modified: trunk/Source/WebCore/html/HTMLButtonElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLButtonElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLButtonElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -59,7 +59,7 @@
     bool hasPresentationalHintsForAttribute(const QualifiedName&) const final;
     void defaultEventHandler(Event&) final;
 
-    bool appendFormData(DOMFormData&, bool) final;
+    bool appendFormData(DOMFormData&) final;
 
     bool isEnumeratable() const final { return true; }
     bool supportLabels() const final { return true; }

Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLFormControlElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -86,7 +86,7 @@
 
     // Override in derived classes to get the encoded name=value pair for submitting.
     // Return true for a successful control (see HTML4-17.13.2).
-    bool appendFormData(DOMFormData&, bool) override { return false; }
+    bool appendFormData(DOMFormData&) override { return false; }
 
     virtual bool isSuccessfulSubmitButton() const { return false; }
     virtual bool isActivatedSubmit() const { return false; }

Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLFormElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -1008,7 +1008,7 @@
     return equalIgnoringASCIICase(attributeWithoutSynchronization(autocompleteAttr), "off") ? off : on;
 }
 
-RefPtr<DOMFormData> HTMLFormElement::constructEntryList(Ref<DOMFormData>&& domFormData, StringPairVector* formValues, IsMultipartForm isMultipartForm)
+RefPtr<DOMFormData> HTMLFormElement::constructEntryList(Ref<DOMFormData>&& domFormData, StringPairVector* formValues)
 {
     // https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#constructing-form-data-set
     ASSERT(isMainThread());
@@ -1021,7 +1021,7 @@
     for (auto& control : this->copyAssociatedElementsVector()) {
         auto& element = control->asHTMLElement();
         if (!element.isDisabledFormControl())
-            control->appendFormData(domFormData.get(), isMultipartForm == IsMultipartForm::Yes);
+            control->appendFormData(domFormData.get());
         if (formValues && is<HTMLInputElement>(element)) {
             auto& input = downcast<HTMLInputElement>(element);
             if (input.isTextField()) {

Modified: trunk/Source/WebCore/html/HTMLFormElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLFormElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLFormElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -127,10 +127,8 @@
 
     static HTMLFormElement* findClosestFormAncestor(const Element&);
     
-    enum class IsMultipartForm : bool { No, Yes };
+    RefPtr<DOMFormData> constructEntryList(Ref<DOMFormData>&&, StringPairVector*);
     
-    RefPtr<DOMFormData> constructEntryList(Ref<DOMFormData>&&, StringPairVector*, IsMultipartForm);
-    
 private:
     HTMLFormElement(const QualifiedName&, Document&);
 

Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLInputElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -948,10 +948,10 @@
     m_isActivatedSubmit = flag;
 }
 
-bool HTMLInputElement::appendFormData(DOMFormData& formData, bool multipart)
+bool HTMLInputElement::appendFormData(DOMFormData& formData)
 {
     Ref<InputType> protectedInputType(*m_inputType);
-    return m_inputType->isFormDataAppendable() && m_inputType->appendFormData(formData, multipart);
+    return m_inputType->isFormDataAppendable() && m_inputType->appendFormData(formData);
 }
 
 void HTMLInputElement::reset()

Modified: trunk/Source/WebCore/html/HTMLInputElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLInputElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLInputElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -406,7 +406,7 @@
 
     void copyNonAttributePropertiesFromElement(const Element&) final;
 
-    bool appendFormData(DOMFormData&, bool) final;
+    bool appendFormData(DOMFormData&) final;
 
     bool isSuccessfulSubmitButton() const final;
     bool matchesDefaultPseudoClass() const final;

Modified: trunk/Source/WebCore/html/HTMLKeygenElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLKeygenElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -117,7 +117,7 @@
     return isKeytypeRSA() ? "rsa"_s : emptyString();
 }
 
-bool HTMLKeygenElement::appendFormData(DOMFormData& formData, bool)
+bool HTMLKeygenElement::appendFormData(DOMFormData& formData)
 {
     // Only RSA is supported at this time.
     if (!isKeytypeRSA())

Modified: trunk/Source/WebCore/html/HTMLKeygenElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLKeygenElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -45,7 +45,7 @@
 
     void parseAttribute(const QualifiedName&, const AtomString&) final;
 
-    bool appendFormData(DOMFormData&, bool) final;
+    bool appendFormData(DOMFormData&) final;
     const AtomString& formControlType() const final;
     bool isOptionalFormControl() const final { return false; }
 

Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLObjectElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -462,7 +462,7 @@
     HTMLPlugInImageElement::didMoveToNewDocument(oldDocument, newDocument);
 }
 
-bool HTMLObjectElement::appendFormData(DOMFormData& formData, bool)
+bool HTMLObjectElement::appendFormData(DOMFormData& formData)
 {
     if (name().isEmpty())
         return false;

Modified: trunk/Source/WebCore/html/HTMLObjectElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLObjectElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLObjectElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -99,7 +99,7 @@
     bool isFormControlElement() const final { return false; }
 
     bool isEnumeratable() const final { return true; }
-    bool appendFormData(DOMFormData&, bool) final;
+    bool appendFormData(DOMFormData&) final;
 
     bool canContainRangeEndPoint() const final;
 

Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLSelectElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -1045,7 +1045,7 @@
         invalidateStyleAndRenderersForSubtree();
 }
 
-bool HTMLSelectElement::appendFormData(DOMFormData& formData, bool)
+bool HTMLSelectElement::appendFormData(DOMFormData& formData)
 {
     const AtomString& name = this->name();
     if (name.isEmpty())

Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLSelectElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -134,7 +134,7 @@
 
     bool childShouldCreateRenderer(const Node&) const final;
     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
-    bool appendFormData(DOMFormData&, bool) final;
+    bool appendFormData(DOMFormData&) final;
 
     void reset() final;
 

Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -222,7 +222,7 @@
     return createRenderer<RenderTextControlMultiLine>(*this, WTFMove(style));
 }
 
-bool HTMLTextAreaElement::appendFormData(DOMFormData& formData, bool)
+bool HTMLTextAreaElement::appendFormData(DOMFormData& formData)
 {
     if (name().isEmpty())
         return false;

Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.h (286446 => 286447)


--- trunk/Source/WebCore/html/HTMLTextAreaElement.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -114,7 +114,7 @@
     bool hasPresentationalHintsForAttribute(const QualifiedName&) const final;
     void collectPresentationalHintsForAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final;
     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
-    bool appendFormData(DOMFormData&, bool) final;
+    bool appendFormData(DOMFormData&) final;
     void reset() final;
     bool hasCustomFocusLogic() const final;
     int defaultTabIndex() const final;

Modified: trunk/Source/WebCore/html/HiddenInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/HiddenInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HiddenInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -89,7 +89,7 @@
     element()->setAttributeWithoutSynchronization(valueAttr, sanitizedValue);
 }
 
-bool HiddenInputType::appendFormData(DOMFormData& formData, bool isMultipartForm) const
+bool HiddenInputType::appendFormData(DOMFormData& formData) const
 {
     ASSERT(element());
     auto name = element()->name();
@@ -98,7 +98,7 @@
         formData.append(name, String { formData.encoding().name() });
         return true;
     }
-    return InputType::appendFormData(formData, isMultipartForm);
+    return InputType::appendFormData(formData);
 }
 
 bool HiddenInputType::shouldRespectHeightAndWidthAttributes()

Modified: trunk/Source/WebCore/html/HiddenInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/HiddenInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/HiddenInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -49,7 +49,7 @@
     bool storesValueSeparateFromAttribute() override;
     bool shouldRespectHeightAndWidthAttributes() override;
     void setValue(const String&, bool, TextFieldEventBehavior) override;
-    bool appendFormData(DOMFormData&, bool) const override;
+    bool appendFormData(DOMFormData&) const override;
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/html/ImageInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/ImageInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/ImageInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -55,7 +55,7 @@
     return true;
 }
 
-bool ImageInputType::appendFormData(DOMFormData& formData, bool) const
+bool ImageInputType::appendFormData(DOMFormData& formData) const
 {
     ASSERT(element());
     if (!element()->isActivatedSubmit())

Modified: trunk/Source/WebCore/html/ImageInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/ImageInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/ImageInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -45,7 +45,7 @@
 private:
     const AtomString& formControlType() const final;
     bool isFormDataAppendable() const final;
-    bool appendFormData(DOMFormData&, bool) const final;
+    bool appendFormData(DOMFormData&) const final;
     RenderPtr<RenderElement> createInputRenderer(RenderStyle&&) final;
     void handleDOMActivateEvent(Event&) final;
     void attributeChanged(const QualifiedName&) final;

Modified: trunk/Source/WebCore/html/InputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/InputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/InputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -196,7 +196,7 @@
     return !element()->name().isEmpty();
 }
 
-bool InputType::appendFormData(DOMFormData& formData, bool) const
+bool InputType::appendFormData(DOMFormData& formData) const
 {
     ASSERT(element());
     // Always successful.

Modified: trunk/Source/WebCore/html/InputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/InputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/InputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -213,7 +213,7 @@
     virtual FormControlState saveFormControlState() const;
     virtual void restoreFormControlState(const FormControlState&);
     virtual bool isFormDataAppendable() const;
-    virtual bool appendFormData(DOMFormData&, bool multipart) const;
+    virtual bool appendFormData(DOMFormData&) const;
 
     // DOM property functions.
 

Modified: trunk/Source/WebCore/html/SubmitInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/SubmitInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/SubmitInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -47,7 +47,7 @@
     return InputTypeNames::submit();
 }
 
-bool SubmitInputType::appendFormData(DOMFormData& formData, bool) const
+bool SubmitInputType::appendFormData(DOMFormData& formData) const
 {
     ASSERT(element());
     if (!element()->isActivatedSubmit())

Modified: trunk/Source/WebCore/html/SubmitInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/SubmitInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/SubmitInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -41,7 +41,7 @@
 
 private:
     const AtomString& formControlType() const override;
-    bool appendFormData(DOMFormData&, bool) const override;
+    bool appendFormData(DOMFormData&) const override;
     bool supportsRequired() const override;
     void handleDOMActivateEvent(Event&) override;
     bool canBeSuccessfulSubmitButton() override;

Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (286446 => 286447)


--- trunk/Source/WebCore/html/TextFieldInputType.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -634,9 +634,9 @@
     m_placeholder->setInnerText(placeholderText);
 }
 
-bool TextFieldInputType::appendFormData(DOMFormData& formData, bool multipart) const
+bool TextFieldInputType::appendFormData(DOMFormData& formData) const
 {
-    InputType::appendFormData(formData, multipart);
+    InputType::appendFormData(formData);
     ASSERT(element());
     auto& dirnameAttrValue = element()->attributeWithoutSynchronization(dirnameAttr);
     if (!dirnameAttrValue.isNull())

Modified: trunk/Source/WebCore/html/TextFieldInputType.h (286446 => 286447)


--- trunk/Source/WebCore/html/TextFieldInputType.h	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/html/TextFieldInputType.h	2021-12-02 21:13:02 UTC (rev 286447)
@@ -98,7 +98,7 @@
     bool shouldRespectListAttribute() override;
     HTMLElement* placeholderElement() const final;
     void updatePlaceholderText() final;
-    bool appendFormData(DOMFormData&, bool multipart) const final;
+    bool appendFormData(DOMFormData&) const final;
     void subtreeHasChanged() final;
     void capsLockStateMayHaveChanged() final;
     void updateAutoFillButton() final;

Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (286446 => 286447)


--- trunk/Source/WebCore/loader/FormSubmission.cpp	2021-12-02 21:04:38 UTC (rev 286446)
+++ trunk/Source/WebCore/loader/FormSubmission.cpp	2021-12-02 21:13:02 UTC (rev 286447)
@@ -212,7 +212,7 @@
     auto domFormData = DOMFormData::create(dataEncoding.encodingForFormSubmissionOrURLParsing());
     StringPairVector formValues;
 
-    auto result = form.constructEntryList(WTFMove(domFormData), &formValues, isMultiPartForm ? HTMLFormElement::IsMultipartForm::Yes : HTMLFormElement::IsMultipartForm::No);
+    auto result = form.constructEntryList(WTFMove(domFormData), &formValues);
     RELEASE_ASSERT(result);
     domFormData = result.releaseNonNull();
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to