Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use USVString for URLUtils and URLUtilsReadOnly.

Browse source
This commit is contained in:
Ms2ger 2015-03-13 19:47:17 +01:00
parent bbbdb98897
commit 0593d77b93
5 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/script/dom/urlhelper.rs
View file

@ -2,7 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use util::str::DOMString;
use dom::bindings::str::USVString;
use url::Url;
use std::borrow::ToOwned;
@ -10,24 +11,24 @@ use std::borrow::ToOwned;
pub struct UrlHelper;
impl UrlHelper {
pub fn Href(url: &Url) -> DOMString {
url.serialize()
pub fn Href(url: &Url) -> USVString {
USVString(url.serialize())
}
pub fn Search(url: &Url) -> DOMString {
match url.query {
pub fn Search(url: &Url) -> USVString {
USVString(match url.query {
None => "".to_owned(),
Some(ref query) if query.as_slice() == "" => "".to_owned(),
Some(ref query) => format!("?{}", query)
}
})
}
pub fn Hash(url: &Url) -> DOMString {
match url.fragment {
pub fn Hash(url: &Url) -> USVString {
USVString(match url.fragment {
None => "".to_owned(),
Some(ref hash) if hash.as_slice() == "" => "".to_owned(),
Some(ref hash) => format!("#{}", hash)
}
})
}
/// https://html.spec.whatwg.org/multipage/browsers.html#same-origin