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/script_traits/lib.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/script_traits/lib.rs')
| -rw-r--r-- | components/script_traits/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 568c1aac0b6..2d4469ef80d 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -51,7 +51,6 @@ use net_traits::response::HttpsState; use net_traits::storage_thread::StorageThread; use profile_traits::mem; use std::any::Any; -use url::Url; use util::ipc::OptionalOpaqueIpcSender; pub use script_msg::{LayoutMsg, ScriptMsg}; @@ -405,8 +404,8 @@ pub enum IFrameSandboxState { /// Specifies the information required to load a URL in an iframe. #[derive(Deserialize, Serialize)] pub struct IFrameLoadInfo { - /// Url to load - pub url: Option<Url>, + /// Load data containing the url to load + pub load_data: Option<LoadData>, /// Pipeline ID of the parent of this iframe pub containing_pipeline_id: PipelineId, /// The new subpage ID for this load |