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/script/dom/request.rs | |
parent | f14e7339b5ff95fce0127dce4fe87ce082ab7259 (diff) | |
download | servo-913c874cb55fd0fdc9e8f3a4c34624cd015fac8a.tar.gz servo-913c874cb55fd0fdc9e8f3a4c34624cd015fac8a.zip |
Urlmageddon: Use refcounted urls more often.
Diffstat (limited to 'components/script/dom/request.rs')
-rw-r--r-- | components/script/dom/request.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 614c51398e8..33a28da99ea 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -35,10 +35,10 @@ use net_traits::request::Referrer as NetTraitsRequestReferrer; use net_traits::request::Request as NetTraitsRequest; use net_traits::request::RequestMode as NetTraitsRequestMode; use net_traits::request::Type as NetTraitsRequestType; +use servo_url::ServoUrl; use std::ascii::AsciiExt; use std::cell::{Cell, Ref}; use std::rc::Rc; -use url::Url; #[dom_struct] pub struct Request { @@ -53,7 +53,7 @@ pub struct Request { impl Request { fn new_inherited(global: &GlobalScope, - url: Url, + url: ServoUrl, is_service_worker_global_scope: bool) -> Request { Request { reflector_: Reflector::new(), @@ -69,7 +69,7 @@ impl Request { } pub fn new(global: &GlobalScope, - url: Url, + url: ServoUrl, is_service_worker_global_scope: bool) -> Root<Request> { reflect_dom_object(box Request::new_inherited(global, url, @@ -468,7 +468,7 @@ impl Request { } fn net_request_from_global(global: &GlobalScope, - url: Url, + url: ServoUrl, is_service_worker_global_scope: bool) -> NetTraitsRequest { let origin = Origin::Origin(global.get_url().origin()); let pipeline_id = global.pipeline_id(); @@ -524,7 +524,7 @@ fn is_cors_safelisted_method(m: &HttpMethod) -> bool { } // https://url.spec.whatwg.org/#include-credentials -fn includes_credentials(input: &Url) -> bool { +fn includes_credentials(input: &ServoUrl) -> bool { !input.username().is_empty() || input.password().is_some() } |