From a79f00c337475aa82dc420b2b822ad233183f692 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Fri, 27 May 2016 11:29:09 +0200 Subject: [PATCH 1/2] Use GetDocumentElement() in Document::invalidate_stylesheets() (fixes #8409) --- components/script/dom/document.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 89755564bb6..8ad0f707058 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1228,7 +1228,7 @@ impl Document { self.stylesheets_changed_since_reflow.set(true); *self.stylesheets.borrow_mut() = None; // Mark the document element dirty so a reflow will be performed. - self.get_html_element().map(|root| { + self.GetDocumentElement().map(|root| { root.upcast::().dirty(NodeDamage::NodeStyleDamaged); }); } From 51e2802047442c7a297c6f51627c9adb1736bdcb Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Fri, 27 May 2016 11:47:32 +0200 Subject: [PATCH 2/2] Remove side-effecting map call per review comments --- components/script/dom/document.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 8ad0f707058..5761bd37bd3 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1228,9 +1228,9 @@ impl Document { self.stylesheets_changed_since_reflow.set(true); *self.stylesheets.borrow_mut() = None; // Mark the document element dirty so a reflow will be performed. - self.GetDocumentElement().map(|root| { - root.upcast::().dirty(NodeDamage::NodeStyleDamaged); - }); + if let Some(element) = self.GetDocumentElement() { + element.upcast::().dirty(NodeDamage::NodeStyleDamaged); + } } pub fn get_and_reset_stylesheets_changed_since_reflow(&self) -> bool {