diff options
| -rw-r--r-- | components/net/blob_loader.rs | 2 | ||||
| -rw-r--r-- | components/net_traits/blob_url_store.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/url.rs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs index 3594dccc265..1fe05cc1c20 100644 --- a/components/net/blob_loader.rs +++ b/components/net/blob_loader.rs @@ -22,7 +22,7 @@ pub fn load_blob_sync filemanager: FileManager) -> Result<(Headers, Vec<u8>), NetworkError> { let (id, origin) = match parse_blob_url(&url) { - Ok((id, origin, _fragment)) => (id, origin), + Ok((id, origin)) => (id, origin), Err(()) => { let e = format!("Invalid blob URL format {:?}", url); return Err(NetworkError::Internal(e)); diff --git a/components/net_traits/blob_url_store.rs b/components/net_traits/blob_url_store.rs index ad01dd28a76..0357b0fec08 100644 --- a/components/net_traits/blob_url_store.rs +++ b/components/net_traits/blob_url_store.rs @@ -35,15 +35,14 @@ pub struct BlobBuf { /// Parse URL as Blob URL scheme's definition /// https://w3c.github.io/FileAPI/#DefinitionOfScheme -pub fn parse_blob_url(url: &ServoUrl) -> Result<(Uuid, FileOrigin, Option<String>), ()> { +pub fn parse_blob_url(url: &ServoUrl) -> Result<(Uuid, FileOrigin), ()> { let url_inner = try!(Url::parse(url.path()).map_err(|_| ())); - let fragment = url_inner.fragment().map(|s| s.to_string()); let id = { let mut segs = try!(url_inner.path_segments().ok_or(())); let id = try!(segs.nth(0).ok_or(())); try!(Uuid::from_str(id).map_err(|_| ())) }; - Ok((id, get_blob_origin(&ServoUrl::from_url(url_inner)), fragment)) + Ok((id, get_blob_origin(&ServoUrl::from_url(url_inner)))) } /// Given an URL, returning the Origin that a Blob created under this diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index cea4c898119..e85225b04d5 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -126,7 +126,7 @@ impl URL { let origin = get_blob_origin(&global.get_url()); if let Ok(url) = ServoUrl::parse(&url) { - if let Ok((id, _, _)) = parse_blob_url(&url) { + if let Ok((id, _)) = parse_blob_url(&url) { let resource_threads = global.resource_threads(); let (tx, rx) = ipc::channel().unwrap(); let msg = FileManagerThreadMsg::RevokeBlobURL(id, origin, tx); |