Move is_connected function from style to layout, where it is used

This commit is contained in:
Fernando Jiménez Moreno 2019-03-07 13:59:23 +01:00
parent 5be6779f9a
commit 5a165c6bd8
3 changed files with 7 additions and 7 deletions

View file

@ -306,10 +306,6 @@ impl<'ln> TNode for ServoLayoutNode<'ln> {
fn is_in_document(&self) -> bool { fn is_in_document(&self) -> bool {
unsafe { self.node.get_flag(NodeFlags::IS_IN_DOC) } unsafe { self.node.get_flag(NodeFlags::IS_IN_DOC) }
} }
fn is_connected(&self) -> bool {
unsafe { self.node.get_flag(NodeFlags::IS_CONNECTED) }
}
} }
impl<'ln> LayoutNode for ServoLayoutNode<'ln> { impl<'ln> LayoutNode for ServoLayoutNode<'ln> {
@ -340,6 +336,10 @@ impl<'ln> LayoutNode for ServoLayoutNode<'ln> {
unsafe fn take_style_and_layout_data(&self) -> OpaqueStyleAndLayoutData { unsafe fn take_style_and_layout_data(&self) -> OpaqueStyleAndLayoutData {
self.get_jsmanaged().take_style_and_layout_data() self.get_jsmanaged().take_style_and_layout_data()
} }
fn is_connected(&self) -> bool {
unsafe { self.node.get_flag(NodeFlags::IS_CONNECTED) }
}
} }
impl<'ln> GetLayoutData for ServoLayoutNode<'ln> { impl<'ln> GetLayoutData for ServoLayoutNode<'ln> {

View file

@ -104,6 +104,9 @@ pub trait LayoutNode: Debug + GetLayoutData + TNode {
fn traverse_preorder(self) -> TreeIterator<Self> { fn traverse_preorder(self) -> TreeIterator<Self> {
TreeIterator::new(self) TreeIterator::new(self)
} }
/// Returns whether the node is connected.
fn is_connected(&self) -> bool;
} }
pub struct ReverseChildrenIterator<ConcreteNode> pub struct ReverseChildrenIterator<ConcreteNode>

View file

@ -188,9 +188,6 @@ pub trait TNode: Sized + Copy + Clone + Debug + NodeInfo + PartialEq {
/// Returns whether the node is attached to a document. /// Returns whether the node is attached to a document.
fn is_in_document(&self) -> bool; fn is_in_document(&self) -> bool;
/// Returns whether the node is connected.
fn is_connected(&self) -> bool;
/// Iterate over the DOM children of a node, in preorder. /// Iterate over the DOM children of a node, in preorder.
fn dom_descendants(&self) -> DomDescendants<Self> { fn dom_descendants(&self) -> DomDescendants<Self> {
DomDescendants { DomDescendants {