From af158de5042fddf24c49627d45de05d269827119 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 12 Nov 2019 12:54:18 -0500 Subject: dom: Reduce the scope of iframe's load blocker borrow. --- components/script/dom/htmliframeelement.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'components/script/dom/htmliframeelement.rs') 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()), -- cgit v1.2.3