Implement shadow-including root, set node as in doc when connected. Makes JS work in shadow trees

1 files changed, 4 insertions, 5 deletions

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 599efd4a8cc..20b51fbfaa1 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -14,7 +14,7 @@ use crate::dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
 use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
 use crate::dom::bindings::codegen::Bindings::FunctionBinding::Function;
 use crate::dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateElementMethods;
-use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
+use crate::dom::bindings::codegen::Bindings::NodeBinding::{GetRootNodeOptions, NodeMethods};
 use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::{ScrollBehavior, ScrollToOptions};
 use crate::dom::bindings::codegen::UnionTypes::NodeOrString;
@@ -484,9 +484,6 @@ impl Element {
             return Err(Error::InvalidState);
         }
 
-        self.upcast::<Node>()
-            .set_flag(NodeFlags::IS_IN_SHADOW_TREE, true);
-
         // Steps 4, 5 and 6.
         Ok(self
             .shadow_root
@@ -3293,7 +3290,9 @@ impl Element {
     /// <https://dom.spec.whatwg.org/#connected>
     pub fn is_connected(&self) -> bool {
         let node = self.upcast::<Node>();
-        let root = node.GetRootNode();
+        let mut options = GetRootNodeOptions::empty();
+        options.composed = true; // shadow included.
+        let root = node.GetRootNode(&options);
         root.is::<Document>()
     }