[orca] Chromium: Treat all static text leaf nodes in the same fashion

[Joanmarie Diggs <joanied src gnome org>]

commit b7373de90608c47aeefdb4cbf690fbd14ff6a474
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Jul 30 12:35:01 2019 -0400

    Chromium: Treat all static text leaf nodes in the same fashion
    
    Exceptions were being made for caret navigation primarily, but those
    exceptions seem obsolete now due to changes in Chromium and/or Orca's
    support for it.

 src/orca/script_utilities.py                          |  2 +-
 src/orca/scripts/toolkits/Chromium/script.py          |  6 +++---
 .../scripts/toolkits/Chromium/script_utilities.py     | 19 +------------------
 3 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 44df20847..6d0a0d8ec 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -1957,7 +1957,7 @@ class Utilities:
 
         return pyatspi.findAncestor(obj, inSelectedMenu) is not None
 
-    def isStaticTextLeaf(self, obj, checkSiblings=True):
+    def isStaticTextLeaf(self, obj):
         return False
 
     def isListItemMarker(self, obj):
diff --git a/src/orca/scripts/toolkits/Chromium/script.py b/src/orca/scripts/toolkits/Chromium/script.py
index 603eb270c..3b458f08e 100644
--- a/src/orca/scripts/toolkits/Chromium/script.py
+++ b/src/orca/scripts/toolkits/Chromium/script.py
@@ -164,7 +164,7 @@ class Script(web.Script):
     def onCaretMoved(self, event):
         """Callback for object:text-caret-moved accessibility events."""
 
-        if self.utilities.isStaticTextLeaf(event.source, False):
+        if self.utilities.isStaticTextLeaf(event.source):
             msg = "CHROMIUM: Ignoring event from static-text leaf"
             debug.println(debug.LEVEL_INFO, msg, True)
             return
@@ -194,7 +194,7 @@ class Script(web.Script):
     def onChildrenChanged(self, event):
         """Callback for object:children-changed accessibility events."""
 
-        if self.utilities.isStaticTextLeaf(event.any_data, False):
+        if self.utilities.isStaticTextLeaf(event.any_data):
             msg = "CHROMIUM: Ignoring because child is static text leaf"
             debug.println(debug.LEVEL_INFO, msg, True)
             return
@@ -371,7 +371,7 @@ class Script(web.Script):
     def onTextSelectionChanged(self, event):
         """Callback for object:text-selection-changed accessibility events."""
 
-        if self.utilities.isStaticTextLeaf(event.source, False):
+        if self.utilities.isStaticTextLeaf(event.source):
             msg = "CHROMIUM: Ignoring event from static-text leaf"
             debug.println(debug.LEVEL_INFO, msg, True)
             return
diff --git a/src/orca/scripts/toolkits/Chromium/script_utilities.py 
b/src/orca/scripts/toolkits/Chromium/script_utilities.py
index 7cef01b69..170a5feaf 100644
--- a/src/orca/scripts/toolkits/Chromium/script_utilities.py
+++ b/src/orca/scripts/toolkits/Chromium/script_utilities.py
@@ -56,7 +56,7 @@ class Utilities(web.Utilities):
         self._isListItemMarker = {}
         self._topLevelObject = {}
 
-    def isStaticTextLeaf(self, obj, checkSiblings=True):
+    def isStaticTextLeaf(self, obj):
         if not (obj and self.inDocumentContent(obj)):
             return super().isStaticTextLeaf(obj)
 
@@ -76,23 +76,6 @@ class Utilities(web.Utilities):
             msg = "CHROMIUM: %s believed to be static text leaf" % obj
             debug.println(debug.LEVEL_INFO, msg, True)
 
-        if rv and obj.parent:
-            if self.isDocument(obj.parent):
-                msg = "CHROMIUM: %s is direct child of document so ignore leaf finding" % obj
-                debug.println(debug.LEVEL_INFO, msg, True)
-                rv = False
-            elif checkSiblings:
-                i = obj.getIndexInParent()
-                if i > 0 and not self.isStaticTextLeaf(obj.parent[i - 1], False) \
-                   and not self.isListItemMarker(obj.parent[0]):
-                    msg = "CHROMIUM: previous sibling of %s is not leaf so ignore leaf finding" % obj
-                    debug.println(debug.LEVEL_INFO, msg, True)
-                    rv = False
-                elif i + 1 < obj.parent.childCount and not self.isStaticTextLeaf(obj.parent[i + 1], False):
-                    msg = "CHROMIUM: next sibling of %s is not leaf so ignore leaf finding" % obj
-                    debug.println(debug.LEVEL_INFO, msg, True)
-                    rv = False
-
         self._isStaticTextLeaf[hash(obj)] = rv
         return rv