From 82c58d0a05d2bf00bbb64fc83dd05469eeec5a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 13 Sep 2017 17:11:24 +0200 Subject: [PATCH] script: Fix stylesheet adoption. --- components/script/dom/htmllinkelement.rs | 4 ++-- components/script/dom/htmlmetaelement.rs | 4 ++-- components/script/dom/htmlstyleelement.rs | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 963f570700a..f1a8242b345 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -242,8 +242,8 @@ impl VirtualMethods for HTMLLinkElement { s.unbind_from_tree(context); } - if let Some(ref s) = *self.stylesheet.borrow() { - document_from_node(self).remove_stylesheet(self.upcast(), s); + if let Some(s) = self.stylesheet.borrow_mut().take() { + document_from_node(self).remove_stylesheet(self.upcast(), &s); } } } diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 5e2d9c1c0b4..dbf5b676879 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -196,8 +196,8 @@ impl VirtualMethods for HTMLMetaElement { if context.tree_in_doc { self.process_referrer_attribute(); - if let Some(ref s) = *self.stylesheet.borrow() { - document_from_node(self).remove_stylesheet(self.upcast(), s); + if let Some(s) = self.stylesheet.borrow_mut().take() { + document_from_node(self).remove_stylesheet(self.upcast(), &s); } } } diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 330ee738466..65c7d11c12f 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -190,9 +190,8 @@ impl VirtualMethods for HTMLStyleElement { } if context.tree_in_doc { - if let Some(ref s) = *self.stylesheet.borrow() { - let doc = document_from_node(self); - doc.remove_stylesheet(self.upcast(), s) + if let Some(s) = self.stylesheet.borrow_mut().take() { + document_from_node(self).remove_stylesheet(self.upcast(), &s) } } }