diff options
author | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-09-01 03:18:42 +0800 |
---|---|---|
committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-12-11 22:46:50 +0800 |
commit | 6e8a85482c2068d4dbccb992954271f725570f91 (patch) | |
tree | b30f6d82a018df0b196fa4d47d3b6667d708313e /components/script/dom/xmlhttprequest.rs | |
parent | 7aa68c8fe7ca0865a7323ab1e5b9526efa588ca2 (diff) | |
download | servo-6e8a85482c2068d4dbccb992954271f725570f91.tar.gz servo-6e8a85482c2068d4dbccb992954271f725570f91.zip |
re-structure blob, structured serialization
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 1953aeddb60..ce90aed8f44 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -18,7 +18,7 @@ use crate::dom::bindings::refcounted::Trusted; use crate::dom::bindings::reflector::{reflect_dom_object, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::bindings::str::{is_token, ByteString, DOMString, USVString}; -use crate::dom::blob::{Blob, BlobImpl}; +use crate::dom::blob::{normalize_type_string, Blob}; use crate::dom::document::DocumentSource; use crate::dom::document::{Document, HasBrowsingContext, IsHTMLDocument}; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -65,6 +65,7 @@ use net_traits::CoreResourceMsg::Fetch; use net_traits::{FetchChannels, FetchMetadata, FilteredMetadata}; use net_traits::{FetchResponseListener, NetworkError, ReferrerPolicy}; use net_traits::{ResourceFetchTiming, ResourceTimingType}; +use script_traits::serializable::BlobImpl; use script_traits::DocumentActivity; use servo_atoms::Atom; use servo_url::ServoUrl; @@ -1260,12 +1261,12 @@ impl XMLHttpRequest { let mime = self .final_mime_type() .as_ref() - .map(|m| m.to_string()) + .map(|m| normalize_type_string(&m.to_string())) .unwrap_or("".to_owned()); // Step 3, 4 let bytes = self.response.borrow().to_vec(); - let blob = Blob::new(&self.global(), BlobImpl::new_from_bytes(bytes), mime); + let blob = Blob::new(&self.global(), BlobImpl::new_from_bytes(bytes, mime)); self.response_blob.set(Some(&blob)); blob } |