Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 23:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Avoid ClipId, ExternalScrollId and ScrollTreeNodeId references (#39372)

Browse source 
Changes function signatures to accept `ClipId`, `ExternalScrollId` and
`ScrollTreeNodeId` instead of `&ClipId`, `&ExternalScrollId` and
`&ScrollTreeNodeId`. This avoids several `&` and `*`.

Testing: not needed, no behavior change.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Oriol Brufau 2025-09-19 01:34:49 +02:00 • committed by GitHub
parent aeeb3cb488
commit 1473121fe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 74 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

45
components/shared/compositing/display_list.rs
View file

@ -413,7 +413,7 @@ impl ScrollTreeNode {
for child_id in &self.children {
scroll_tree
.get_node(child_id)
.get_node(*child_id)
.invalidate_cached_transforms(scroll_tree, invalid);
}
}
@ -434,11 +434,11 @@ impl ScrollTree {
/// Add a scroll node to this ScrollTree returning the id of the new node.
pub fn add_scroll_tree_node(
&mut self,
parent: Option<&ScrollTreeNodeId>,
parent: Option<ScrollTreeNodeId>,
info: SpatialTreeNodeInfo,
) -> ScrollTreeNodeId {
self.nodes.push(ScrollTreeNode {
parent: parent.cloned(),
parent,
children: Vec::new(),
webrender_id: None,
info,
@ -465,24 +465,24 @@ impl ScrollTree {
}
/// Get a mutable reference to the node with the given index.
pub fn get_node_mut(&mut self, id: &ScrollTreeNodeId) -> &mut ScrollTreeNode {
pub fn get_node_mut(&mut self, id: ScrollTreeNodeId) -> &mut ScrollTreeNode {
&mut self.nodes[id.index]
}
/// Get an immutable reference to the node with the given index.
pub fn get_node(&self, id: &ScrollTreeNodeId) -> &ScrollTreeNode {
pub fn get_node(&self, id: ScrollTreeNodeId) -> &ScrollTreeNode {
&self.nodes[id.index]
}
/// Get the WebRender [`SpatialId`] for the given [`ScrollNodeId`]. This will
/// panic if [`ScrollTree::build_display_list`] has not been called yet.
pub fn webrender_id(&self, id: &ScrollTreeNodeId) -> SpatialId {
pub fn webrender_id(&self, id: ScrollTreeNodeId) -> SpatialId {
self.get_node(id).webrender_id()
}
pub fn scroll_node_or_ancestor_inner(
&mut self,
scroll_node_id: &ScrollTreeNodeId,
scroll_node_id: ScrollTreeNodeId,
scroll_location: ScrollLocation,
context: ScrollType,
) -> Option<(ExternalScrollId, LayoutVector2D)> {
@ -495,20 +495,19 @@ impl ScrollTree {
node.parent
};
parent.and_then(|parent| {
self.scroll_node_or_ancestor_inner(&parent, scroll_location, context)
})
parent
.and_then(|parent| self.scroll_node_or_ancestor_inner(parent, scroll_location, context))
}
fn node_with_external_scroll_node_id(
&self,
external_id: &ExternalScrollId,
external_id: ExternalScrollId,
) -> Option<ScrollTreeNodeId> {
self.nodes
.iter()
.enumerate()
.find_map(|(index, node)| match &node.info {
SpatialTreeNodeInfo::Scroll(info) if info.external_id == *external_id => {
SpatialTreeNodeInfo::Scroll(info) if info.external_id == external_id => {
Some(ScrollTreeNodeId { index })
},
_ => None,
@ -521,12 +520,12 @@ impl ScrollTree {
/// new offset if a scroll was performed, otherwise returns None.
pub fn scroll_node_or_ancestor(
&mut self,
external_id: &ExternalScrollId,
external_id: ExternalScrollId,
scroll_location: ScrollLocation,
context: ScrollType,
) -> Option<(ExternalScrollId, LayoutVector2D)> {
let scroll_node_id = self.node_with_external_scroll_node_id(external_id)?;
let result = self.scroll_node_or_ancestor_inner(&scroll_node_id, scroll_location, context);
let result = self.scroll_node_or_ancestor_inner(scroll_node_id, scroll_location, context);
if result.is_some() {
self.invalidate_cached_transforms();
}
@ -609,7 +608,7 @@ impl ScrollTree {
/// point in the root coordinate system.
pub fn cumulative_node_to_root_transform(
&self,
node_id: &ScrollTreeNodeId,
node_id: ScrollTreeNodeId,
) -> FastLayoutTransform {
let node = self.get_node(node_id);
if let Some(cached_transforms) = node.transformation_cache.get() {
@ -626,7 +625,7 @@ impl ScrollTree {
/// transform is uninvertible.
pub fn cumulative_root_to_node_transform(
&self,
node_id: &ScrollTreeNodeId,
node_id: ScrollTreeNodeId,
) -> Option<FastLayoutTransform> {
let node = self.get_node(node_id);
if let Some(cached_transforms) = node.transformation_cache.get() {
@ -644,7 +643,7 @@ impl ScrollTree {
node: &ScrollTreeNode,
) -> (ScrollTreeNodeTransformationCache, AncestorStickyInfo) {
let (parent_transforms, mut sticky_info) = match node.parent {
Some(parent_id) => self.cumulative_node_transform_inner(self.get_node(&parent_id)),
Some(parent_id) => self.cumulative_node_transform_inner(self.get_node(parent_id)),
None => (Default::default(), Default::default()),
};
@ -712,13 +711,13 @@ impl ScrollTree {
&self,
id: ScrollTreeNodeId,
) -> Option<ExternalScrollId> {
let mut maybe_node = Some(self.get_node(&id));
let mut maybe_node = Some(self.get_node(id));
while let Some(node) = maybe_node {
if let Some(external_scroll_id) = node.external_id() {
return Some(external_scroll_id);
}
maybe_node = node.parent.map(|id| self.get_node(&id));
maybe_node = node.parent.map(|id| self.get_node(id));
}
None
@ -752,12 +751,12 @@ impl ScrollTree {
fn debug_print_traversal(
&self,
print_tree: &mut PrintTree,
current_id: &ScrollTreeNodeId,
current_id: ScrollTreeNodeId,
adjacency_list: &[Vec<ScrollTreeNodeId>],
) {
for node_id in &adjacency_list[current_id.index] {
self.nodes[node_id.index].debug_print(print_tree, node_id.index);
self.debug_print_traversal(print_tree, node_id, adjacency_list);
self.debug_print_traversal(print_tree, *node_id, adjacency_list);
}
print_tree.end_level();
}
@ -775,7 +774,7 @@ impl ScrollTree {
let root_id = ScrollTreeNodeId { index: 0 };
self.nodes[root_id.index].debug_print(&mut print_tree, root_id.index);
self.debug_print_traversal(&mut print_tree, &root_id, &adj_list);
self.debug_print_traversal(&mut print_tree, root_id, &adj_list);
print_tree.end_level();
}
}
@ -842,7 +841,7 @@ impl CompositorDisplayListInfo {
}),
);
let root_scroll_node_id = scroll_tree.add_scroll_tree_node(
Some(&root_reference_frame_id),
Some(root_reference_frame_id),
SpatialTreeNodeInfo::Scroll(ScrollableNodeInfo {
external_id: ExternalScrollId(0, pipeline_id),
content_rect: LayoutRect::from_origin_and_size(LayoutPoint::zero(), content_size),

42
components/shared/compositing/tests/compositor.rs
View file

@ -25,7 +25,7 @@ fn add_mock_scroll_node(tree: &mut ScrollTree) -> (ScrollTreeNodeId, ExternalScr
let external_id = ExternalScrollId(num_nodes as u64, pipeline_id);
let scroll_node_id = tree.add_scroll_tree_node(
parent.as_ref(),
parent,
SpatialTreeNodeInfo::Scroll(ScrollableNodeInfo {
external_id,
content_rect: Size2D::new(200.0, 200.0).into(),
@ -48,7 +48,7 @@ fn test_scroll_tree_simple_scroll() {
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(
&external_id,
external_id,
ScrollLocation::Delta(LayoutVector2D::new(20.0, 40.0)),
ScrollType::Script,
)
@ -56,11 +56,11 @@ fn test_scroll_tree_simple_scroll() {
let expected_offset = LayoutVector2D::new(20.0, 40.0);
assert_eq!(scrolled_id, external_id);
assert_eq!(offset, expected_offset);
assert_eq!(scroll_tree.get_node(&id).offset(), Some(expected_offset));
assert_eq!(scroll_tree.get_node(id).offset(), Some(expected_offset));
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(
&external_id,
external_id,
ScrollLocation::Delta(LayoutVector2D::new(-20.0, -40.0)),
ScrollType::Script,
)
@ -68,17 +68,17 @@ fn test_scroll_tree_simple_scroll() {
let expected_offset = LayoutVector2D::new(0.0, 0.0);
assert_eq!(scrolled_id, external_id);
assert_eq!(offset, expected_offset);
assert_eq!(scroll_tree.get_node(&id).offset(), Some(expected_offset));
assert_eq!(scroll_tree.get_node(id).offset(), Some(expected_offset));
// Scroll offsets must be positive.
let result = scroll_tree.scroll_node_or_ancestor(
&external_id,
external_id,
ScrollLocation::Delta(LayoutVector2D::new(-20.0, -40.0)),
ScrollType::Script,
);
assert!(result.is_none());
assert_eq!(
scroll_tree.get_node(&id).offset(),
scroll_tree.get_node(id).offset(),
Some(LayoutVector2D::new(0.0, 0.0))
);
}
@ -92,7 +92,7 @@ fn test_scroll_tree_simple_scroll_chaining() {
let unscrollable_external_id = ExternalScrollId(100 as u64, pipeline_id);
let unscrollable_child_id = scroll_tree.add_scroll_tree_node(
Some(&parent_id),
Some(parent_id),
SpatialTreeNodeInfo::Scroll(ScrollableNodeInfo {
external_id: unscrollable_external_id,
content_rect: Size2D::new(100.0, 100.0).into(),
@ -108,7 +108,7 @@ fn test_scroll_tree_simple_scroll_chaining() {
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(
&unscrollable_external_id,
unscrollable_external_id,
ScrollLocation::Delta(LayoutVector2D::new(20.0, 40.0)),
ScrollType::Script,
)
@ -117,13 +117,13 @@ fn test_scroll_tree_simple_scroll_chaining() {
assert_eq!(scrolled_id, parent_external_id);
assert_eq!(offset, expected_offset);
assert_eq!(
scroll_tree.get_node(&parent_id).offset(),
scroll_tree.get_node(parent_id).offset(),
Some(expected_offset)
);
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(
&unscrollable_external_id,
unscrollable_external_id,
ScrollLocation::Delta(LayoutVector2D::new(10.0, 15.0)),
ScrollType::Script,
)
@ -132,11 +132,11 @@ fn test_scroll_tree_simple_scroll_chaining() {
assert_eq!(scrolled_id, parent_external_id);
assert_eq!(offset, expected_offset);
assert_eq!(
scroll_tree.get_node(&parent_id).offset(),
scroll_tree.get_node(parent_id).offset(),
Some(expected_offset)
);
assert_eq!(
scroll_tree.get_node(&unscrollable_child_id).offset(),
scroll_tree.get_node(unscrollable_child_id).offset(),
Some(LayoutVector2D::zero())
);
}
@ -149,14 +149,14 @@ fn test_scroll_tree_chain_when_at_extent() {
let (child_id, child_external_id) = add_mock_scroll_node(&mut scroll_tree);
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(&child_external_id, ScrollLocation::End, ScrollType::Script)
.scroll_node_or_ancestor(child_external_id, ScrollLocation::End, ScrollType::Script)
.unwrap();
let expected_offset = LayoutVector2D::new(0.0, 100.0);
assert_eq!(scrolled_id, child_external_id);
assert_eq!(offset, expected_offset);
assert_eq!(
scroll_tree.get_node(&child_id).offset(),
scroll_tree.get_node(child_id).offset(),
Some(expected_offset)
);
@ -164,7 +164,7 @@ fn test_scroll_tree_chain_when_at_extent() {
// of its scroll area in the y axis.
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(
&child_external_id,
child_external_id,
ScrollLocation::Delta(LayoutVector2D::new(0.0, 10.0)),
ScrollType::Script,
)
@ -173,7 +173,7 @@ fn test_scroll_tree_chain_when_at_extent() {
assert_eq!(scrolled_id, parent_external_id);
assert_eq!(offset, expected_offset);
assert_eq!(
scroll_tree.get_node(&parent_id).offset(),
scroll_tree.get_node(parent_id).offset(),
Some(expected_offset)
);
}
@ -186,7 +186,7 @@ fn test_scroll_tree_chain_through_overflow_hidden() {
// reflect `overflow: hidden` ie not responsive to non-script scroll events.
let (parent_id, parent_external_id) = add_mock_scroll_node(&mut scroll_tree);
let (overflow_hidden_id, overflow_hidden_external_id) = add_mock_scroll_node(&mut scroll_tree);
let node = scroll_tree.get_node_mut(&overflow_hidden_id);
let node = scroll_tree.get_node_mut(overflow_hidden_id);
if let SpatialTreeNodeInfo::Scroll(ref mut scroll_node_info) = node.info {
scroll_node_info.scroll_sensitivity = AxesScrollSensitivity {
@ -197,7 +197,7 @@ fn test_scroll_tree_chain_through_overflow_hidden() {
let (scrolled_id, offset) = scroll_tree
.scroll_node_or_ancestor(
&overflow_hidden_external_id,
overflow_hidden_external_id,
ScrollLocation::Delta(LayoutVector2D::new(20.0, 40.0)),
ScrollType::InputEvents,
)
@ -206,11 +206,11 @@ fn test_scroll_tree_chain_through_overflow_hidden() {
assert_eq!(scrolled_id, parent_external_id);
assert_eq!(offset, expected_offset);
assert_eq!(
scroll_tree.get_node(&parent_id).offset(),
scroll_tree.get_node(parent_id).offset(),
Some(expected_offset)
);
assert_eq!(
scroll_tree.get_node(&overflow_hidden_id).offset(),
scroll_tree.get_node(overflow_hidden_id).offset(),
Some(LayoutVector2D::new(0.0, 0.0))
);
}