aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2019-11-12 12:54:18 -0500
committerJosh Matthews <josh@joshmatthews.net>2019-11-12 13:57:54 -0500
commitaf158de5042fddf24c49627d45de05d269827119 (patch)
tree7de3f74da7cce6ba3162220f0567a68ef70aa0be /components/script/dom/htmliframeelement.rs
parentbf69b6fea7c7eed2ba3b96e5c77573f25b7929ed (diff)
downloadservo-af158de5042fddf24c49627d45de05d269827119.tar.gz
servo-af158de5042fddf24c49627d45de05d269827119.zip
dom: Reduce the scope of iframe's load blocker borrow.
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index df94aeb361c..b70663a6949 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -130,10 +130,12 @@ impl HTMLIFrameElement {
let document = document_from_node(self);
- let mut load_blocker = self.load_blocker.borrow_mut();
- // Any oustanding load is finished from the point of view of the blocked
- // document; the new navigation will continue blocking it.
- LoadBlocker::terminate(&mut load_blocker);
+ {
+ let mut load_blocker = self.load_blocker.borrow_mut();
+ // Any oustanding load is finished from the point of view of the blocked
+ // document; the new navigation will continue blocking it.
+ LoadBlocker::terminate(&mut load_blocker);
+ }
if load_data.url.scheme() == "javascript" {
let window_proxy = self.GetContentWindow();
@@ -150,6 +152,7 @@ impl HTMLIFrameElement {
match load_data.js_eval_result {
Some(JsEvalResult::NoContent) => (),
_ => {
+ let mut load_blocker = self.load_blocker.borrow_mut();
*load_blocker = Some(LoadBlocker::new(
&*document,
LoadType::Subframe(load_data.url.clone()),