eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

layout: Store AccessibilityTree's nodes in ArcRefCells. (#44438)

Browse Source 
This will allow us not to need to repeatedly borrow `self` when
reading/updating individual `AccessibilityNode`s.

Testing: No behaviour change, covered by existing `accessibility` test.

---------

Signed-off-by: Alice Boxhall <alice@igalia.com>
Co-authored-by: delan azabani <dazabani@igalia.com>
This commit is contained in:
Alice
2026-04-24 07:42:17 +02:00
committed by GitHub
parent 25ef3121a7
commit 6a84134a34
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
components/layout/accessibility_tree.rs
View File

@@ -10,6 +10,8 @@ use script::layout_dom::ServoLayoutNode;
use servo_base::Epoch; use servo_base::Epoch;
use style::dom::{NodeInfo, OpaqueNode}; use style::dom::{NodeInfo, OpaqueNode};
use crate::ArcRefCell;
struct AccessibilityUpdate { struct AccessibilityUpdate {
accesskit_update: accesskit::TreeUpdate, accesskit_update: accesskit::TreeUpdate,
nodes: FxHashMap<accesskit::NodeId, accesskit::Node>, nodes: FxHashMap<accesskit::NodeId, accesskit::Node>,
@@ -23,7 +25,7 @@ struct AccessibilityNode {
#[derive(Debug)] #[derive(Debug)]
pub struct AccessibilityTree { pub struct AccessibilityTree {
nodes: FxHashMap<accesskit::NodeId, AccessibilityNode>, nodes: FxHashMap<accesskit::NodeId, ArcRefCell<AccessibilityNode>>,
accesskit_tree: accesskit::Tree, accesskit_tree: accesskit::Tree,
tree_id: accesskit::TreeId, tree_id: accesskit::TreeId,
epoch: Epoch, epoch: Epoch,
@@ -48,7 +50,7 @@ impl AccessibilityTree {
tree_id, tree_id,
epoch, epoch,
}; };
tree.nodes.insert(root_node.id, root_node); tree.nodes.insert(root_node.id, ArcRefCell::new(root_node));
tree tree
} }
@@ -59,16 +61,19 @@ impl AccessibilityTree {
) -> Option<accesskit::TreeUpdate> { ) -> Option<accesskit::TreeUpdate> {
let mut tree_update = AccessibilityUpdate::new(self.accesskit_tree.clone(), self.tree_id); let mut tree_update = AccessibilityUpdate::new(self.accesskit_tree.clone(), self.tree_id);
let root_dom_node_id = Self::to_accesskit_id(&root_dom_node.opaque()); {
let root_node = self let root_dom_node_id = Self::to_accesskit_id(&root_dom_node.opaque());
.nodes let root_node = self
.get_mut(&AccessibilityTree::ROOT_NODE_ID) .nodes
.unwrap(); .get_mut(&AccessibilityTree::ROOT_NODE_ID)
root_node .expect("Guaranteed by Self::new");
.accesskit_node let mut root_node = root_node.borrow_mut();
.set_children(vec![root_dom_node_id]); root_node
.accesskit_node
.set_children(vec![root_dom_node_id]);
tree_update.add(root_node); tree_update.add(&root_node);
}
self.update_node_and_children(root_dom_node, &mut tree_update); self.update_node_and_children(root_dom_node, &mut tree_update);
Some(tree_update.finalize()) Some(tree_update.finalize())
@@ -81,7 +86,8 @@ impl AccessibilityTree {
) { ) {
// TODO: read accessibility damage from dom_node (right now, assume damage is complete) // TODO: read accessibility damage from dom_node (right now, assume damage is complete)
let node = self.get_or_create_node_mut(dom_node); let node = self.get_or_create_node(dom_node);
let mut node = node.borrow_mut();
let accesskit_node = &mut node.accesskit_node; let accesskit_node = &mut node.accesskit_node;
let mut new_children: Vec<accesskit::NodeId> = vec![]; let mut new_children: Vec<accesskit::NodeId> = vec![];
@@ -103,19 +109,24 @@ impl AccessibilityTree {
accesskit_node.set_role(Role::GenericContainer); accesskit_node.set_role(Role::GenericContainer);
} }
tree_update.add(node); tree_update.add(&node);
for dom_child in dom_node.flat_tree_children() { for dom_child in dom_node.flat_tree_children() {
self.update_node_and_children(&dom_child, tree_update); self.update_node_and_children(&dom_child, tree_update);
} }
} }
fn get_or_create_node_mut(&mut self, dom_node: &ServoLayoutNode<'_>) -> &mut AccessibilityNode { fn get_or_create_node(
&mut self,
dom_node: &ServoLayoutNode<'_>,
) -> ArcRefCell<AccessibilityNode> {
let id = Self::to_accesskit_id(&dom_node.opaque()); let id = Self::to_accesskit_id(&dom_node.opaque());
self.nodes let node = self
.nodes
.entry(id) .entry(id)
.or_insert_with(|| AccessibilityNode::new(id)) .or_insert_with(|| ArcRefCell::new(AccessibilityNode::new(id)));
node.clone()
} }
fn to_accesskit_id(opaque: &OpaqueNode) -> accesskit::NodeId { fn to_accesskit_id(opaque: &OpaqueNode) -> accesskit::NodeId {