[orca] Only sanity check ambiguous roles when identifying focus-mode widgets

[Joanmarie Diggs <joanied src gnome org>]

commit 044654842427a7c4358cdd2174a83a08a09a45f7
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu May 16 13:29:14 2019 +0200

    Only sanity check ambiguous roles when identifying focus-mode widgets

 src/orca/scripts/web/script_utilities.py | 40 ++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index ac1748692..e4cd74617 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -1760,26 +1760,30 @@ class Utilities(script_utilities.Utilities):
            or state.contains(pyatspi.STATE_EXPANDABLE):
             return True
 
-        focusModeRoles = [pyatspi.ROLE_COMBO_BOX,
-                          pyatspi.ROLE_EMBEDDED,
-                          pyatspi.ROLE_ENTRY,
-                          pyatspi.ROLE_LIST_BOX,
+        alwaysFocusModeRoles = [pyatspi.ROLE_COMBO_BOX,
+                                pyatspi.ROLE_ENTRY,
+                                pyatspi.ROLE_LIST_BOX,
+                                pyatspi.ROLE_MENU,
+                                pyatspi.ROLE_MENU_ITEM,
+                                pyatspi.ROLE_CHECK_MENU_ITEM,
+                                pyatspi.ROLE_RADIO_MENU_ITEM,
+                                pyatspi.ROLE_PAGE_TAB,
+                                pyatspi.ROLE_PASSWORD_TEXT,
+                                pyatspi.ROLE_PROGRESS_BAR,
+                                pyatspi.ROLE_SLIDER,
+                                pyatspi.ROLE_SPIN_BUTTON,
+                                pyatspi.ROLE_TOOL_BAR,
+                                pyatspi.ROLE_TREE_ITEM,
+                                pyatspi.ROLE_TREE_TABLE,
+                                pyatspi.ROLE_TREE]
+
+        if role in alwaysFocusModeRoles:
+            return True
+
+        focusModeRoles = [pyatspi.ROLE_EMBEDDED,
                           pyatspi.ROLE_LIST_ITEM,
-                          pyatspi.ROLE_MENU,
-                          pyatspi.ROLE_MENU_ITEM,
-                          pyatspi.ROLE_CHECK_MENU_ITEM,
-                          pyatspi.ROLE_RADIO_MENU_ITEM,
-                          pyatspi.ROLE_PAGE_TAB,
-                          pyatspi.ROLE_PASSWORD_TEXT,
-                          pyatspi.ROLE_PROGRESS_BAR,
-                          pyatspi.ROLE_SLIDER,
-                          pyatspi.ROLE_SPIN_BUTTON,
-                          pyatspi.ROLE_TOOL_BAR,
                           pyatspi.ROLE_TABLE_CELL,
-                          pyatspi.ROLE_TABLE,
-                          pyatspi.ROLE_TREE_ITEM,
-                          pyatspi.ROLE_TREE_TABLE,
-                          pyatspi.ROLE_TREE]
+                          pyatspi.ROLE_TABLE]
 
         if role in focusModeRoles \
            and not self.isTextBlockElement(obj) \