[orca] Prefer name over displayed text for widgets in web content

[Joanmarie Diggs <joanied src gnome org>]

commit cbbe0620b45791c253e9231a4fc35c44d5e83d15
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Oct 6 14:20:40 2015 -0400

    Prefer name over displayed text for widgets in web content
    
    Otherwise, the author-provided ARIA name may get ignored.

 src/orca/formatting.py                    |    4 ++--
 src/orca/scripts/web/braille_generator.py |    2 +-
 src/orca/scripts/web/speech_generator.py  |    4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 6ff2b3a..2b3da2f 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -414,8 +414,8 @@ formatting = {
             },
         pyatspi.ROLE_TOGGLE_BUTTON: {
             'focused': 'expandableState or toggleState',
-            'unfocused': 'labelAndName + roleName + (expandableState or toggleState) + availability + ' + 
MNEMONIC + ' + accelerator',
-            'basicWhereAmI': 'labelAndName + roleName + (expandableState or toggleState)'
+            'unfocused': 'labelOrName + roleName + (expandableState or toggleState) + availability + ' + 
MNEMONIC + ' + accelerator',
+            'basicWhereAmI': 'labelOrName + roleName + (expandableState or toggleState)'
             },
         pyatspi.ROLE_TOOL_TIP: {
             'unfocused': 'labelAndName',
diff --git a/src/orca/scripts/web/braille_generator.py b/src/orca/scripts/web/braille_generator.py
index 952e76d..371b480 100644
--- a/src/orca/scripts/web/braille_generator.py
+++ b/src/orca/scripts/web/braille_generator.py
@@ -106,7 +106,7 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
             return []
 
         if self._script.utilities.inDocumentContent(obj) and obj.name:
-            return self._generateName(obj, **args)
+            return [obj.name]
 
         return super()._generateLabelOrName(obj, **args)
 
diff --git a/src/orca/scripts/web/speech_generator.py b/src/orca/scripts/web/speech_generator.py
index 26645a5..1c7710a 100644
--- a/src/orca/scripts/web/speech_generator.py
+++ b/src/orca/scripts/web/speech_generator.py
@@ -143,7 +143,9 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
             return []
 
         if self._script.utilities.inDocumentContent(obj) and obj.name:
-            return self._generateName(obj, **args)
+            result = [obj.name]
+            result.extend(self.voice(speech_generator.DEFAULT))
+            return result
 
         return super()._generateLabelOrName(obj, **args)