diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-30 18:43:30 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-30 18:43:30 -0700 |
commit | 77cb2ca89a87829e7e95fad17ae698c4ae097455 (patch) | |
tree | e82267b6bbb1c95548260f8335edb85a089e82b2 /components/compositing/constellation.rs | |
parent | a868bb2a90a5fabf0af8125bae14120e3439d1ed (diff) | |
parent | 3110647852b0dec459414c0bebef61d89d156f64 (diff) | |
download | servo-77cb2ca89a87829e7e95fad17ae698c4ae097455.tar.gz servo-77cb2ca89a87829e7e95fad17ae698c4ae097455.zip |
Auto merge of #10712 - KiChjang:multipart-form-data, r=jdm
Support form submission of multipart/form-data
Fixes #7553.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10712)
<!-- Reviewable:end -->
Diffstat (limited to 'components/compositing/constellation.rs')
-rw-r--r-- | components/compositing/constellation.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 6e09fc4b15d..b855885b88a 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -982,7 +982,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF> }; // If no url is specified, reload. - let new_url = load_info.url.clone() + let new_url = load_info.load_data.clone().map(|data| data.url) .or_else(|| old_pipeline.map(|old_pipeline| old_pipeline.url.clone())) .unwrap_or_else(|| Url::parse("about:blank").expect("infallible")); @@ -1016,13 +1016,20 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF> }; + let load_data = if let Some(mut data) = load_info.load_data { + data.url = new_url; + data + } else { + // TODO - loaddata here should have referrer info (not None, None) + LoadData::new(new_url, None, None) + }; + // Create the new pipeline, attached to the parent and push to pending frames - // TODO - loaddata here should have referrer info (not None, None) self.new_pipeline(load_info.new_pipeline_id, Some((load_info.containing_pipeline_id, load_info.new_subpage_id)), window_size, script_chan, - LoadData::new(new_url, None, None)); + load_data); self.subpage_map.insert((load_info.containing_pipeline_id, load_info.new_subpage_id), load_info.new_pipeline_id); |