Auto merge of #14246 - emilio:servo-url, r=SimonSapin

Urlmageddon

<!-- Please describe your changes on the following line: -->

Still needs a bunch of code in net to be converted in order to get more
advantage of this for images and stuff, but meanwhile this should help quite a
bit with #13778.

Still wanted to get this in.

r? @SimonSapin

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14246)
<!-- Reviewable:end -->

1 files changed, 14 insertions, 10 deletions

diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 4ecc6a44fa0..cbf32ef9aab 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -380,10 +380,12 @@ impl HTMLFormElement {
     fn mutate_action_url(&self, form_data: &mut Vec<FormDatum>, mut load_data: LoadData, encoding: EncodingRef) {
         let charset = &*encoding.whatwg_name().unwrap();
 
-        load_data.url.query_pairs_mut().clear()
-                 .encoding_override(Some(self.pick_encoding()))
-                 .extend_pairs(form_data.into_iter()
-                                        .map(|field| (field.name.clone(), field.replace_value(charset))));
+        if let Some(ref mut url) = load_data.url.as_mut_url() {
+            url.query_pairs_mut().clear()
+               .encoding_override(Some(self.pick_encoding()))
+               .extend_pairs(form_data.into_iter()
+                                      .map(|field| (field.name.clone(), field.replace_value(charset))));
+        }
 
         self.plan_to_navigate(load_data);
     }
@@ -394,16 +396,18 @@ impl HTMLFormElement {
         let boundary = generate_boundary();
         let bytes = match enctype {
             FormEncType::UrlEncoded => {
-                let mut url = load_data.url.clone();
                 let charset = &*encoding.whatwg_name().unwrap();
                 load_data.headers.set(ContentType::form_url_encoded());
 
-                url.query_pairs_mut().clear()
-                   .encoding_override(Some(self.pick_encoding()))
-                   .extend_pairs(form_data.into_iter()
-                                          .map(|field| (field.name.clone(), field.replace_value(charset))));
 
-                url.query().unwrap_or("").to_string().into_bytes()
+                if let Some(ref mut url) = load_data.url.as_mut_url() {
+                    url.query_pairs_mut().clear()
+                       .encoding_override(Some(self.pick_encoding()))
+                       .extend_pairs(form_data.into_iter()
+                       .map(|field| (field.name.clone(), field.replace_value(charset))));
+                }
+
+                load_data.url.query().unwrap_or("").to_string().into_bytes()
             }
             FormEncType::FormDataEncoded => {
                 let mime = mime!(Multipart / FormData; Boundary =(&boundary));