mirror of
https://github.com/servo/servo.git
synced 2025-06-17 21:04:28 +00:00
c831c2c0a5
Now that JSRef<T> is gone, there is no need to have helper traits.
On components/script/*.rs:
# Remove imports.
/^ *use dom::[a-z]+::\{.*Helpers/ {
s/\{(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers, /\{/
s/, (Raw[^L]|[^L][^a])[a-zA-Z]+Helpers([,}])/\2/g
s/\{([a-zA-Z]+)\}/\1/
/\{\}/d
s/::self;$/;/
}
/^ *use dom::[a-z]+::\{?(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers\}?;$/d
On components/script/dom/*.rs:
# Ignore layout things.
/^(pub )?(impl|trait).*Layout.* \{/,/^}$/ { P; D; }
# Delete helpers traits.
/^(pub )?trait ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? \{$/,/^\}$/D
# Patch private helpers.
/^impl.*Private.*Helpers/,/^\}$/ {
s/^impl<'a> Private([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for &'a ([^ ]+) \{$/impl \3 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
# Patch public helpers.
/^impl.*Helpers/,/^\}$/ {
s/^impl(<'a>)? ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for (&'a )?([^ ]+) \{$/impl \5 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn .*\(&?self[,)]/s/(unsafe )?fn/pub &/
/^ *pub (unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
The few error cases were then fixed by hand.
112 lines
3.2 KiB
Rust
112 lines
3.2 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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 dom::bindings::codegen::Bindings::LocationBinding;
|
|
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::{JS, Root};
|
|
use dom::bindings::str::USVString;
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
use dom::urlhelper::UrlHelper;
|
|
use dom::window::Window;
|
|
|
|
use url::{Url, UrlParser};
|
|
use util::str::DOMString;
|
|
|
|
#[dom_struct]
|
|
pub struct Location {
|
|
reflector_: Reflector,
|
|
window: JS<Window>,
|
|
}
|
|
|
|
impl Location {
|
|
fn new_inherited(window: &Window) -> Location {
|
|
Location {
|
|
reflector_: Reflector::new(),
|
|
window: JS::from_ref(window)
|
|
}
|
|
}
|
|
|
|
pub fn new(window: &Window) -> Root<Location> {
|
|
reflect_dom_object(box Location::new_inherited(window),
|
|
GlobalRef::Window(window),
|
|
LocationBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl<'a> LocationMethods for &'a Location {
|
|
// https://html.spec.whatwg.org/multipage/#dom-location-assign
|
|
fn Assign(self, url: DOMString) {
|
|
let window = self.window.root();
|
|
// TODO: per spec, we should use the _API base URL_ specified by the
|
|
// _entry settings object_.
|
|
let base_url = window.get_url();
|
|
if let Ok(url) = UrlParser::new().base_url(&base_url).parse(&url) {
|
|
window.load_url(url);
|
|
}
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-hash
|
|
fn Hash(self) -> USVString {
|
|
UrlHelper::Hash(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-href
|
|
fn Href(self) -> USVString {
|
|
UrlHelper::Href(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-host
|
|
fn Host(self) -> USVString {
|
|
UrlHelper::Host(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-hostname
|
|
fn Hostname(self) -> USVString {
|
|
UrlHelper::Hostname(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-password
|
|
fn Password(self) -> USVString {
|
|
UrlHelper::Password(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-pathname
|
|
fn Pathname(self) -> USVString {
|
|
UrlHelper::Pathname(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-port
|
|
fn Port(self) -> USVString {
|
|
UrlHelper::Port(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-protocol
|
|
fn Protocol(self) -> USVString {
|
|
UrlHelper::Protocol(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#URLUtils-stringification-behavior
|
|
fn Stringifier(self) -> DOMString {
|
|
self.Href().0
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-search
|
|
fn Search(self) -> USVString {
|
|
UrlHelper::Search(&self.get_url())
|
|
}
|
|
|
|
// https://url.spec.whatwg.org/#dom-urlutils-username
|
|
fn Username(self) -> USVString {
|
|
UrlHelper::Username(&self.get_url())
|
|
}
|
|
}
|
|
|
|
|
|
impl Location {
|
|
fn get_url(&self) -> Url {
|
|
let window = self.window.root();
|
|
window.r().get_url()
|
|
}
|
|
}
|