From 5be6779f9a65218a41d970eab6f01dd5d6b60775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Thu, 7 Mar 2019 13:40:34 +0100 Subject: [PATCH] Revert style/dom_apis changes --- components/style/dom_apis.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/components/style/dom_apis.rs b/components/style/dom_apis.rs index c66bb66c9f5..e43c861271e 100644 --- a/components/style/dom_apis.rs +++ b/components/style/dom_apis.rs @@ -241,11 +241,10 @@ where } if root.as_shadow_root().is_some() { - debug_assert!(element.as_node().is_in_document(), "Not connected?"); debug_assert_eq!( element.containing_shadow().unwrap().as_node(), root, - "Where did this element come from?" + "Not connected?" ); return true; } @@ -277,17 +276,17 @@ where } if root.is_in_document() { - if let Some(shadow) = root.as_shadow_root() { - return shadow.elements_with_id(id); - } - - if let Some(shadow) = root.as_element().and_then(|e| e.containing_shadow()) { - return shadow.elements_with_id(id); - } - return root.owner_doc().elements_with_id(id); } + if let Some(shadow) = root.as_shadow_root() { + return shadow.elements_with_id(id); + } + + if let Some(shadow) = root.as_element().and_then(|e| e.containing_shadow()) { + return shadow.elements_with_id(id); + } + Err(()) }