| Index: ui/accessibility/platform/ax_platform_node_auralinux.cc
|
| diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc
|
| index 4a85863c714950168cafb0947003eb0e01c00112..46dd7dd3ac164f6afbd350cfb5db56aa926fd8e3 100644
|
| --- a/ui/accessibility/platform/ax_platform_node_auralinux.cc
|
| +++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
|
| @@ -461,23 +461,22 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkRole() {
|
| }
|
|
|
| void AXPlatformNodeAuraLinux::GetAtkState(AtkStateSet* atk_state_set) {
|
| - const uint32_t state = GetData().state;
|
| -
|
| - if (state & (1 << ui::AX_STATE_DEFAULT))
|
| + AXNodeData data = GetData();
|
| + if (data.HasState(ui::AX_STATE_DEFAULT))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_DEFAULT);
|
| - if (state & (1 << ui::AX_STATE_EDITABLE))
|
| + if (data.HasState(ui::AX_STATE_EDITABLE))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_EDITABLE);
|
| - if (!(state & (1 << ui::AX_STATE_DISABLED)))
|
| + if (!data.HasState(ui::AX_STATE_DISABLED))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_ENABLED);
|
| - if (state & (1 << ui::AX_STATE_EXPANDED))
|
| + if (data.HasState(ui::AX_STATE_EXPANDED))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_EXPANDED);
|
| - if (state & (1 << ui::AX_STATE_FOCUSABLE))
|
| + if (data.HasState(ui::AX_STATE_FOCUSABLE))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_FOCUSABLE);
|
| - if (state & (1 << ui::AX_STATE_PRESSED))
|
| + if (data.HasState(ui::AX_STATE_PRESSED))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_PRESSED);
|
| - if (state & (1 << ui::AX_STATE_SELECTABLE))
|
| + if (data.HasState(ui::AX_STATE_SELECTABLE))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTABLE);
|
| - if (state & (1 << ui::AX_STATE_SELECTED))
|
| + if (data.HasState(ui::AX_STATE_SELECTED))
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTED);
|
|
|
| // Checked state
|
|
|