aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/location.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-19 17:47:27 -0400
committerGitHub <noreply@github.com>2018-09-19 17:47:27 -0400
commitdf2adebefdfa3da49f173e480fa1e56450f9bda2 (patch)
tree1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/location.rs
parent2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff)
parentc37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff)
downloadservo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz
servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix part of #21373. - [x] These changes do not require tests because they format code only. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21737) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/location.rs')
-rw-r--r--components/script/dom/location.rs18
1 files changed, 11 insertions, 7 deletions
diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs
index af66934802a..696819b9b47 100644
--- a/components/script/dom/location.rs
+++ b/components/script/dom/location.rs
@@ -25,22 +25,23 @@ impl Location {
fn new_inherited(window: &Window) -> Location {
Location {
reflector_: Reflector::new(),
- window: Dom::from_ref(window)
+ window: Dom::from_ref(window),
}
}
pub fn new(window: &Window) -> DomRoot<Location> {
- reflect_dom_object(Box::new(Location::new_inherited(window)),
- window,
- LocationBinding::Wrap)
+ reflect_dom_object(
+ Box::new(Location::new_inherited(window)),
+ window,
+ LocationBinding::Wrap,
+ )
}
fn get_url(&self) -> ServoUrl {
self.window.get_url()
}
- fn set_url_component(&self, value: USVString,
- setter: fn(&mut ServoUrl, USVString)) {
+ fn set_url_component(&self, value: USVString, setter: fn(&mut ServoUrl, USVString)) {
let mut url = self.window.get_url();
setter(&mut url, value);
self.window.load_url(url, false, false, None);
@@ -49,7 +50,10 @@ impl Location {
fn check_same_origin_domain(&self) -> ErrorResult {
let entry_document = GlobalScope::entry().as_window().Document();
let this_document = self.window.Document();
- if entry_document.origin().same_origin_domain(this_document.origin()) {
+ if entry_document
+ .origin()
+ .same_origin_domain(this_document.origin())
+ {
Ok(())
} else {
Err(Error::Security)