aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/formdata.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-12-10 07:50:27 -0500
committerGitHub <noreply@github.com>2019-12-10 07:50:27 -0500
commit4d5bf653f72a4ebf02c627eda7c5fa7f3744cbe8 (patch)
tree05b0d5187d3665ab7d001f2a62f548255c5d8134 /components/script/dom/formdata.rs
parent8a7de32d5b8b735caf21d45d3b007ebc2644e7dd (diff)
parent7f41b1b2941824451de81febb5bee135fb863f62 (diff)
downloadservo-4d5bf653f72a4ebf02c627eda7c5fa7f3744cbe8.tar.gz
servo-4d5bf653f72a4ebf02c627eda7c5fa7f3744cbe8.zip
Auto merge of #25217 - pshaughn:fix25150, r=jdm
hidden field named _charset_ now appears in FormData as UTF-8 <!-- Please describe your changes on the following line: --> HTMLInputElement now has special case logic for putting a hidden field named `_charset_` in an entry set. To support this, the encoding used when constructing a form dataset is now being passed further down the callchain than it was before. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #25150 <!-- Either: --> - [X] There are tests for these changes <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/formdata.rs')
-rw-r--r--components/script/dom/formdata.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs
index 7a084ca0162..d0572e9b0e1 100644
--- a/components/script/dom/formdata.rs
+++ b/components/script/dom/formdata.rs
@@ -55,7 +55,7 @@ impl FormData {
form: Option<&HTMLFormElement>,
) -> Fallible<DomRoot<FormData>> {
if let Some(opt_form) = form {
- return match opt_form.get_form_dataset(None) {
+ return match opt_form.get_form_dataset(None, None) {
Some(form_datums) => Ok(FormData::new(Some(form_datums), global)),
None => Err(Error::InvalidState),
};