diff options
author | Emilio Cobos Álvarez <ecoal95@gmail.com> | 2016-11-16 11:57:39 +0100 |
---|---|---|
committer | Emilio Cobos Álvarez <ecoal95@gmail.com> | 2016-11-17 18:34:23 +0100 |
commit | 913c874cb55fd0fdc9e8f3a4c34624cd015fac8a (patch) | |
tree | 4526ecefafe0cde2f56cb1e2a4ebffd372e1f70a /components/net/chrome_loader.rs | |
parent | f14e7339b5ff95fce0127dce4fe87ce082ab7259 (diff) | |
download | servo-913c874cb55fd0fdc9e8f3a4c34624cd015fac8a.tar.gz servo-913c874cb55fd0fdc9e8f3a4c34624cd015fac8a.zip |
Urlmageddon: Use refcounted urls more often.
Diffstat (limited to 'components/net/chrome_loader.rs')
-rw-r--r-- | components/net/chrome_loader.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/net/chrome_loader.rs b/components/net/chrome_loader.rs index b019141121e..5e14d130fb1 100644 --- a/components/net/chrome_loader.rs +++ b/components/net/chrome_loader.rs @@ -6,13 +6,13 @@ use file_loader; use mime_classifier::MimeClassifier; use net_traits::{LoadConsumer, LoadData, NetworkError}; use resource_thread::{CancellationListener, send_error}; +use servo_url::ServoUrl; use std::fs::canonicalize; use std::sync::Arc; -use url::Url; use url::percent_encoding::percent_decode; use util::resource_files::resources_dir_path; -pub fn resolve_chrome_url(url: &Url) -> Result<Url, ()> { +pub fn resolve_chrome_url(url: &ServoUrl) -> Result<ServoUrl, ()> { assert_eq!(url.scheme(), "chrome"); if url.host_str() != Some("resources") { return Err(()) @@ -29,7 +29,7 @@ pub fn resolve_chrome_url(url: &Url) -> Result<Url, ()> { } match canonicalize(path) { Ok(ref path) if path.starts_with(&resources) && path.exists() => { - Ok(Url::from_file_path(path).unwrap()) + Ok(ServoUrl::from_file_path(path).unwrap()) } _ => Err(()) } |