Commit f3341874 authored by Benjamin Beaudry's avatar Benjamin Beaudry Committed by Commit Bot

Fix AXPlatformNode::IsUIAControl

One of my previous change introduced a regression in determining if an
element should be considered as a UIA control. The previous CL changed
the default value returned by AXNodeData::IsReadOnlyOrDisabled from true
to false, but AXPlatformNodeWin::IsUIAControl's use of this method
needed to be adjusted to the new implementation.

This CL fixes it.

Bug: 928948
Change-Id: Ia5d2ff96e7200ad8806be19f52a249645037bf6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018163Reviewed-by: default avatarAdam Ettenberger <adettenb@microsoft.com>
Reviewed-by: default avatarKurt Catti-Schmidt <kschmi@microsoft.com>
Commit-Queue: Benjamin Beaudry <benjamin.beaudry@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#735031}
parent 7a218129
AriaProperties changed on role=menu, name=menu
MenuOpened
MenuOpened on role=menu, name=menu
MenuOpened on role=region
=== Start Continuation ===
AriaProperties changed on role=menu
MenuOpened
MenuOpened on role=menu
MenuOpened on role=region
=== Start Continuation ===
MenuClosed
MenuClosed
......
......@@ -6676,9 +6676,9 @@ bool AXPlatformNodeWin::IsUIAControl() const {
}
return true;
}
// non web-content case
// non web-content case.
const ui::AXNodeData& data = GetData();
return !(GetData().IsReadOnlyOrDisabled() ||
return !((IsReadOnlySupported(data.role) && data.IsReadOnlyOrDisabled()) ||
data.HasState(ax::mojom::State::kInvisible) ||
data.role == ax::mojom::Role::kIgnored);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment