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

Use or_init where appropriate.

Browse source
This commit is contained in:
Ms2ger 2014-12-05 15:20:37 +01:00
parent 6bd9bf979b
commit f0ef1f97ad
5 changed files with 20 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/workerglobalscope.rs
View file

@ -6,7 +6,7 @@ use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScop
use dom::bindings::codegen::Bindings::FunctionBinding::Function;
use dom::bindings::error::{ErrorResult, Fallible, Syntax, Network, FailureUnknown};
use dom::bindings::global;
use dom::bindings::js::{MutNullableJS, JSRef, Temporary, OptionalSettable};
use dom::bindings::js::{MutNullableJS, JSRef, Temporary};
use dom::bindings::utils::{Reflectable, Reflector};
use dom::console::Console;
use dom::eventtarget::{EventTarget, WorkerGlobalScopeTypeId};
@ -93,11 +93,9 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
}
fn Location(self) -> Temporary<WorkerLocation> {
if self.location.get().is_none() {
let location = WorkerLocation::new(self, self.worker_url.clone());
self.location.assign(Some(location));
}
self.location.get().unwrap()
self.location.or_init(|| {
WorkerLocation::new(self, self.worker_url.clone())
})
}
fn ImportScripts(self, url_strings: Vec<DOMString>) -> ErrorResult {
@ -133,19 +131,11 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
}
fn Navigator(self) -> Temporary<WorkerNavigator> {
if self.navigator.get().is_none() {
let navigator = WorkerNavigator::new(self);
self.navigator.assign(Some(navigator));
}
self.navigator.get().unwrap()
self.navigator.or_init(|| WorkerNavigator::new(self))
}
fn Console(self) -> Temporary<Console> {
if self.console.get().is_none() {
let console = Console::new(global::Worker(self));
self.console.assign(Some(console));
}
self.console.get().unwrap()
self.console.or_init(|| Console::new(global::Worker(self)))
}
fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> {