[orca] Chromium: Don't always check siblings to confirm static text leaf status



commit 753f1b05ea3055fb95f8b3b766cec426394afced
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu May 16 17:46:54 2019 +0200

    Chromium: Don't always check siblings to confirm static text leaf status

 src/orca/script_utilities.py                           | 2 +-
 src/orca/scripts/toolkits/Chromium/script.py           | 6 +++---
 src/orca/scripts/toolkits/Chromium/script_utilities.py | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 4b26220f1..a6e62187d 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):
+    def isStaticTextLeaf(self, obj, checkSiblings=True):
         return False
 
     def getOnScreenObjects(self, root, extents=None):
diff --git a/src/orca/scripts/toolkits/Chromium/script.py b/src/orca/scripts/toolkits/Chromium/script.py
index b391f3449..243e6a863 100644
--- a/src/orca/scripts/toolkits/Chromium/script.py
+++ b/src/orca/scripts/toolkits/Chromium/script.py
@@ -163,7 +163,7 @@ class Script(web.Script):
     def onCaretMoved(self, event):
         """Callback for object:text-caret-moved accessibility events."""
 
-        if self.utilities.isStaticTextLeaf(event.source):
+        if self.utilities.isStaticTextLeaf(event.source, False):
             msg = "CHROMIUM: Ignoring event from static-text leaf"
             debug.println(debug.LEVEL_INFO, msg, True)
             return
@@ -193,7 +193,7 @@ class Script(web.Script):
     def onChildrenChanged(self, event):
         """Callback for object:children-changed accessibility events."""
 
-        if self.utilities.isStaticTextLeaf(event.any_data):
+        if self.utilities.isStaticTextLeaf(event.any_data, False):
             msg = "CHROMIUM: Ignoring because child is static text leaf"
             debug.println(debug.LEVEL_INFO, msg, True)
             return
@@ -378,7 +378,7 @@ class Script(web.Script):
     def onTextSelectionChanged(self, event):
         """Callback for object:text-selection-changed accessibility events."""
 
-        if self.utilities.isStaticTextLeaf(event.source):
+        if self.utilities.isStaticTextLeaf(event.source, False):
             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 05cc0bff2..100c0accb 100644
--- a/src/orca/scripts/toolkits/Chromium/script_utilities.py
+++ b/src/orca/scripts/toolkits/Chromium/script_utilities.py
@@ -51,7 +51,7 @@ class Utilities(web.Utilities):
         self._isStaticTextLeaf = {}
         self._isPseudoElement = {}
 
-    def isStaticTextLeaf(self, obj):
+    def isStaticTextLeaf(self, obj, checkSiblings=True):
         if not (obj and self.inDocumentContent(obj)):
             return super().isStaticTextLeaf(obj)
 
@@ -70,13 +70,13 @@ class Utilities(web.Utilities):
                 msg = "CHROMIUM: %s is direct child of document so ignore leaf finding" % obj
                 debug.println(debug.LEVEL_INFO, msg, True)
                 rv = False
-            else:
+            elif checkSiblings:
                 i = obj.getIndexInParent()
-                if i > 0 and not self.isStaticTextLeaf(obj.parent[i - 1]):
+                if i > 0 and not self.isStaticTextLeaf(obj.parent[i - 1], False):
                     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]):
+                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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]