Skip to content
Permalink
Browse files

windowproxy: prevent unnecessary calls to set_window

  • Loading branch information...
gterzian committed Aug 14, 2019
1 parent 9043f24 commit 9acf3f6d4d8630e1b824a7cd652827ba1159e081
Showing with 12 additions and 1 deletion.
  1. +12 −1 components/script/dom/windowproxy.rs
@@ -602,12 +602,23 @@ impl WindowProxy {
}

pub fn set_currently_active(&self, window: &Window) {
let globalscope = window.upcast();
let globalscope = window.upcast::<GlobalScope>();
let dest_pipeline_id = globalscope.pipeline_id();
if let Some(pipeline_id) = self.currently_active() {
if pipeline_id == dest_pipeline_id {
return debug!(
"Attempt to set the currently active window to the currently active window."
);
}
}
self.set_window(&*globalscope, &PROXY_HANDLER);
self.currently_active.set(Some(globalscope.pipeline_id()));
}

pub fn unset_currently_active(&self) {
if self.currently_active().is_none() {
return debug!("Attempt to unset the currently active window on a windowproxy that does not have one.");
}
let globalscope = self.global();
let window = DissimilarOriginWindow::new(&*globalscope, self);
self.set_window(&*window.upcast(), &XORIGIN_PROXY_HANDLER);

0 comments on commit 9acf3f6

Please sign in to comment.
You can’t perform that action at this time.