[orca/gnome-3-36] Chromium: Ensure the prior object is passed along when generating labelOrName

[Joanmarie Diggs <joanied src gnome org>]

commit 139af55ca83a194c30eab4e750130076f5da251e
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Apr 15 16:52:07 2020 -0400

    Chromium: Ensure the prior object is passed along when generating labelOrName

 src/orca/scripts/toolkits/Chromium/speech_generator.py | 2 +-
 src/orca/scripts/web/script.py                         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Chromium/speech_generator.py 
b/src/orca/scripts/toolkits/Chromium/speech_generator.py
index 841b211f3..608210d0c 100644
--- a/src/orca/scripts/toolkits/Chromium/speech_generator.py
+++ b/src/orca/scripts/toolkits/Chromium/speech_generator.py
@@ -71,7 +71,7 @@ class SpeechGenerator(web.SpeechGenerator):
                 # Eliminates including "untitled" in the frame name.
                 return super()._generateLabelOrName(obj.parent)
 
-        return super()._generateLabelOrName(obj)
+        return super()._generateLabelOrName(obj, **args)
 
     def _generateRoleName(self, obj, **args):
         if self._script.utilities.isListItemMarker(obj):
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index da1eba38c..93b2bb020 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -1589,12 +1589,11 @@ class Script(default.Script):
 
         if not _settingsManager.getSetting('caretNavigationEnabled') \
            or self._inFocusMode or isEditable:
+            msg = "WEB: Setting locusOfFocus, context to: %s, %i" % (event.source, event.detail1)
+            debug.println(debug.LEVEL_INFO, msg, True)
             self.utilities.setCaretContext(event.source, event.detail1)
             notify = event.source.getState().contains(pyatspi.STATE_FOCUSED)
             orca.setLocusOfFocus(event, event.source, notify)
-            msg = "WEB: Setting locusOfFocus, context to: %s, %i" % \
-                  (event.source, event.detail1)
-            debug.println(debug.LEVEL_INFO, msg, True)
             return False
 
         self.utilities.setCaretContext(obj, offset)