diff options
author | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-11-21 15:06:30 +0800 |
---|---|---|
committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-11-21 22:30:08 +0800 |
commit | a21c0bfd1a6463422f84b52b8781a5d6aee1c4d1 (patch) | |
tree | f75b12f6a49e679332750d502cb01041af1f0d6a /components/script/script_thread.rs | |
parent | d553158e95cd5988eeb3e32310c11971c0450449 (diff) | |
download | servo-a21c0bfd1a6463422f84b52b8781a5d6aee1c4d1.tar.gz servo-a21c0bfd1a6463422f84b52b8781a5d6aee1c4d1.zip |
ensure unload run with old pipeline as currently-active, do not nullify proxy unless currently-active
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index dbc4f0fb444..0318843fc7e 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -3118,7 +3118,8 @@ impl ScriptThread { opener: Option<BrowsingContextId>, ) -> DomRoot<WindowProxy> { if let Some(window_proxy) = self.window_proxies.borrow().get(&browsing_context_id) { - window_proxy.set_currently_active(&*window); + // Note: we do not set the window to be the currently-active one, + // this will be done instead when the script-thread handles the `SetDocumentActivity` msg. return DomRoot::from_ref(window_proxy); } let iframe = parent_info.and_then(|parent_id| { |