diff options
Diffstat (limited to 'components/script/dom/htmlelement.rs')
| -rw-r--r-- | components/script/dom/htmlelement.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index ade940c536e..95ac9918996 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -28,7 +28,7 @@ use crate::dom::htmlhtmlelement::HTMLHtmlElement; use crate::dom::htmlinputelement::{HTMLInputElement, InputType}; use crate::dom::htmllabelelement::HTMLLabelElement; use crate::dom::node::{document_from_node, window_from_node}; -use crate::dom::node::{Node, NodeFlags}; +use crate::dom::node::{BindContext, Node, NodeFlags, ShadowIncluding}; use crate::dom::nodelist::NodeList; use crate::dom::text::Text; use crate::dom::virtualmethods::VirtualMethods; @@ -459,7 +459,7 @@ impl HTMLElementMethods for HTMLElement { let element = self.upcast::<Element>(); // Step 1. - let element_not_rendered = !node.is_in_doc() || !element.has_css_layout_box(); + let element_not_rendered = !node.is_connected() || !element.has_css_layout_box(); if element_not_rendered { return node.GetTextContent().unwrap(); } @@ -707,7 +707,7 @@ impl HTMLElement { let root_element = element.root_element(); let root_node = root_element.upcast::<Node>(); let children = root_node - .traverse_preorder() + .traverse_preorder(ShadowIncluding::No) .filter_map(DomRoot::downcast::<Element>) .filter(|elem| elem.is::<HTMLLabelElement>()) .filter(|elem| elem.get_string_attribute(&local_name!("for")) == id) @@ -740,9 +740,9 @@ impl VirtualMethods for HTMLElement { } } - fn bind_to_tree(&self, tree_in_doc: bool) { + fn bind_to_tree(&self, context: &BindContext) { if let Some(ref s) = self.super_type() { - s.bind_to_tree(tree_in_doc); + s.bind_to_tree(context); } self.update_sequentially_focusable_status(); } |