1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- ui/accessibility/ax_tree.cc.orig 2025-10-21 20:19:54 UTC
+++ ui/accessibility/ax_tree.cc
@@ -700,7 +700,7 @@ struct AXTreeUpdateState {
// (crrev.com/c/2892259).
const raw_ref<const AXTreeUpdate> pending_tree_update;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
bool should_clear_extra_announcement_nodes = false;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -855,7 +855,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged(
return old_node_is_ignored != new_node_is_ignored;
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) {
assertive_node_ = CreateNode("assertive", root);
polite_node_ = CreateNode("polite", root);
@@ -948,7 +948,7 @@ void AXTree::Destroy() {
void AXTree::Destroy() {
base::ElapsedThreadTimer timer;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
ClearExtraAnnouncementNodes();
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -1602,7 +1602,7 @@ bool AXTree::Unserialize(const AXTreeUpdate& update) {
observers_.Notify(&AXTreeObserver::OnAtomicUpdateFinished, this,
root_->id() != old_root_id, changes);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (update_state.should_clear_extra_announcement_nodes) {
ClearExtraAnnouncementNodes();
}
@@ -2188,7 +2188,7 @@ void AXTree::NotifyNodeAttributesWillChange(
new_data);
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
void AXTree::ClearExtraAnnouncementNodes() {
if (!extra_announcement_nodes_) {
return;
@@ -2598,7 +2598,7 @@ bool AXTree::CreateNewChildVector(
AXTreeUpdateState* update_state) {
DCHECK(GetTreeUpdateInProgressState());
bool success = true;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// If the root node has children added, clear the extra announcement nodes,
// which should always have their indices as the last two children of the root
// node. They will be recreated if needed, and given the correct indices.
|