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

windowproxy: prevent unnecessary calls to set_window

Browse source
This commit is contained in:
Gregory Terzian 2019-08-14 20:38:47 +02:00
parent 9043f247d9
commit 9acf3f6d4d
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/windowproxy.rs
View file

@ -602,12 +602,23 @@ impl WindowProxy {
} }
pub fn set_currently_active(&self, window: &Window) { 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.set_window(&*globalscope, &PROXY_HANDLER);
self.currently_active.set(Some(globalscope.pipeline_id())); self.currently_active.set(Some(globalscope.pipeline_id()));
} }
pub fn unset_currently_active(&self) { 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 globalscope = self.global();
let window = DissimilarOriginWindow::new(&*globalscope, self); let window = DissimilarOriginWindow::new(&*globalscope, self);
self.set_window(&*window.upcast(), &XORIGIN_PROXY_HANDLER); self.set_window(&*window.upcast(), &XORIGIN_PROXY_HANDLER);