Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Speed up dom iteration in querySelector

Browse source 
This removes a few branches and null-checks that I found in profiles.

Depends on D163627

Differential Revision: https://phabricator.services.mozilla.com/D163628
This commit is contained in:
Emilio Cobos Álvarez 2022-12-03 11:25:10 +00:00 • committed by Martin Robinson
parent b6d9b77a15
commit 60bd00980d
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/style/dom.rs
View file

@ -95,7 +95,7 @@ where
#[inline] #[inline]
fn next(&mut self) -> Option<N> { fn next(&mut self) -> Option<N> {
let prev = self.previous.take()?; let prev = self.previous.take()?;
self.previous = prev.next_in_preorder(Some(self.scope)); self.previous = prev.next_in_preorder(self.scope);
self.previous self.previous
} }
} }
@ -164,6 +164,7 @@ pub trait TNode: Sized + Copy + Clone + Debug + NodeInfo + PartialEq {
fn owner_doc(&self) -> Self::ConcreteDocument; fn owner_doc(&self) -> Self::ConcreteDocument;
/// Iterate over the DOM children of a node. /// Iterate over the DOM children of a node.
#[inline(always)]
fn dom_children(&self) -> DomChildren<Self> { fn dom_children(&self) -> DomChildren<Self> {
DomChildren(self.first_child()) DomChildren(self.first_child())
} }
@ -172,6 +173,7 @@ pub trait TNode: Sized + Copy + Clone + Debug + NodeInfo + PartialEq {
fn is_in_document(&self) -> bool; fn is_in_document(&self) -> bool;
/// Iterate over the DOM children of a node, in preorder. /// Iterate over the DOM children of a node, in preorder.
#[inline(always)]
fn dom_descendants(&self) -> DomDescendants<Self> { fn dom_descendants(&self) -> DomDescendants<Self> {
DomDescendants { DomDescendants {
previous: Some(*self), previous: Some(*self),
@ -179,26 +181,26 @@ pub trait TNode: Sized + Copy + Clone + Debug + NodeInfo + PartialEq {
} }
} }
/// Returns the next children in pre-order, optionally scoped to a subtree /// Returns the next node after this one, in a pre-order tree-traversal of
/// root. /// the subtree rooted at scoped_to.
#[inline] #[inline]
fn next_in_preorder(&self, scoped_to: Option<Self>) -> Option<Self> { fn next_in_preorder(&self, scoped_to: Self) -> Option<Self> {
if let Some(c) = self.first_child() { if let Some(c) = self.first_child() {
return Some(c); return Some(c);
} }
let mut current = Some(*self); let mut current = *self;
loop { loop {
if current == scoped_to { if current == scoped_to {
return None; return None;
} }
debug_assert!(current.is_some(), "not a descendant of the scope?"); if let Some(s) = current.next_sibling() {
if let Some(s) = current?.next_sibling() {
return Some(s); return Some(s);
} }
current = current?.parent_node(); debug_assert!(current.parent_node().is_some(), "Not a descendant of the scope?");
current = current.parent_node()?;
} }
} }