aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-09-13 10:13:35 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2017-09-13 10:53:05 +0200
commit1c46135c75bac6dca2ae41fd811943f3c4cf337b (patch)
treee7e73d0c6ba9143a95fba51f406e015bb3cec489
parentb8ae82ffb832c2281b76bc100e6c0e1c40f1afb9 (diff)
downloadservo-1c46135c75bac6dca2ae41fd811943f3c4cf337b.tar.gz
servo-1c46135c75bac6dca2ae41fd811943f3c4cf337b.zip
Reformat DissimilarOriginWindow::new
-rw-r--r--components/script/dom/dissimilaroriginwindow.rs29
1 files changed, 17 insertions, 12 deletions
diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs
index a0eeb7d4a6e..489efe2b844 100644
--- a/components/script/dom/dissimilaroriginwindow.rs
+++ b/components/script/dom/dissimilaroriginwindow.rs
@@ -45,22 +45,27 @@ pub struct DissimilarOriginWindow {
impl DissimilarOriginWindow {
#[allow(unsafe_code)]
- pub fn new(global_to_clone_from: &GlobalScope, window_proxy: &WindowProxy) -> Root<DissimilarOriginWindow> {
+ pub fn new(
+ global_to_clone_from: &GlobalScope,
+ window_proxy: &WindowProxy,
+ ) -> Root<Self> {
let cx = global_to_clone_from.get_cx();
// Any timer events fired on this window are ignored.
let (timer_event_chan, _) = ipc::channel().unwrap();
- let win = box DissimilarOriginWindow {
- globalscope: GlobalScope::new_inherited(PipelineId::new(),
- global_to_clone_from.devtools_chan().cloned(),
- global_to_clone_from.mem_profiler_chan().clone(),
- global_to_clone_from.time_profiler_chan().clone(),
- global_to_clone_from.script_to_constellation_chan().clone(),
- global_to_clone_from.scheduler_chan().clone(),
- global_to_clone_from.resource_threads().clone(),
- timer_event_chan,
- global_to_clone_from.origin().clone()),
+ let win = box Self {
+ globalscope: GlobalScope::new_inherited(
+ PipelineId::new(),
+ global_to_clone_from.devtools_chan().cloned(),
+ global_to_clone_from.mem_profiler_chan().clone(),
+ global_to_clone_from.time_profiler_chan().clone(),
+ global_to_clone_from.script_to_constellation_chan().clone(),
+ global_to_clone_from.scheduler_chan().clone(),
+ global_to_clone_from.resource_threads().clone(),
+ timer_event_chan,
+ global_to_clone_from.origin().clone(),
+ ),
window_proxy: JS::from_ref(window_proxy),
- location: MutNullableJS::new(None),
+ location: Default::default(),
};
unsafe { DissimilarOriginWindowBinding::Wrap(cx, win) }
}