Chromium Code Reviews| 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..3c1dfdc929ea986d012fabbb77da7e739301796f 100644 |
| --- a/ui/accessibility/platform/ax_platform_node_auralinux.cc |
| +++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc |
| @@ -461,23 +461,21 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkRole() { |
| } |
| void AXPlatformNodeAuraLinux::GetAtkState(AtkStateSet* atk_state_set) { |
| - const uint32_t state = GetData().state; |
| - |
| - if (state & (1 << ui::AX_STATE_DEFAULT)) |
| + if (GetData().HasState(ui::AX_STATE_DEFAULT)) |
|
tapted
2017/05/05 05:53:36
Cache GetData() to a local var?
Patti Lor
2017/05/08 00:28:08
Done.
|
| atk_state_set_add_state(atk_state_set, ATK_STATE_DEFAULT); |
| - if (state & (1 << ui::AX_STATE_EDITABLE)) |
| + if (GetData().HasState(ui::AX_STATE_EDITABLE)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_EDITABLE); |
| - if (!(state & (1 << ui::AX_STATE_DISABLED))) |
| + if (!GetData().HasState(ui::AX_STATE_DISABLED)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_ENABLED); |
| - if (state & (1 << ui::AX_STATE_EXPANDED)) |
| + if (GetData().HasState(ui::AX_STATE_EXPANDED)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_EXPANDED); |
| - if (state & (1 << ui::AX_STATE_FOCUSABLE)) |
| + if (GetData().HasState(ui::AX_STATE_FOCUSABLE)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_FOCUSABLE); |
| - if (state & (1 << ui::AX_STATE_PRESSED)) |
| + if (GetData().HasState(ui::AX_STATE_PRESSED)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_PRESSED); |
| - if (state & (1 << ui::AX_STATE_SELECTABLE)) |
| + if (GetData().HasState(ui::AX_STATE_SELECTABLE)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTABLE); |
| - if (state & (1 << ui::AX_STATE_SELECTED)) |
| + if (GetData().HasState(ui::AX_STATE_SELECTED)) |
| atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTED); |
| // Checked state |