[orca] Do not distinguish between ARIA and non-ARIA widgets when generating speech and braille

[Joanmarie Diggs <joanied src gnome org>]

commit 6cc93d080963fff65aa3a58fdbd8e40da4b3b267
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Aug 7 14:20:18 2014 -0400

    Do not distinguish between ARIA and non-ARIA widgets when generating speech and braille
    
    Widgets are widgets and should be treated (and presented) consistently

 .../scripts/toolkits/Gecko/braille_generator.py    |    7 -------
 .../scripts/toolkits/Gecko/speech_generator.py     |   13 +++----------
 2 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/braille_generator.py 
b/src/orca/scripts/toolkits/Gecko/braille_generator.py
index 42fae09..7772698 100644
--- a/src/orca/scripts/toolkits/Gecko/braille_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/braille_generator.py
@@ -170,13 +170,7 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
 
     def generateBraille(self, obj, **args):
         result = []
-        # ARIA widgets get treated like regular default widgets.
-        #
         args['includeContext'] = not self._script.inDocumentContent(obj)
-        args['useDefaultFormatting'] = \
-            self._script.isAriaWidget(obj) \
-            or ((obj.getRole() == pyatspi.ROLE_LIST) \
-                and (not obj.getState().contains(pyatspi.STATE_FOCUSABLE)))
 
         oldRole = None
         if self._script.utilities.isEntry(obj):
@@ -195,7 +189,6 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
         result.extend(braille_generator.BrailleGenerator.\
                           generateBraille(self, obj, **args))
         del args['includeContext']
-        del args['useDefaultFormatting']
         if oldRole:
             self._restoreRole(oldRole, args)
         return result
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py 
b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 6e07d0e..2d854e7 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -150,8 +150,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
                         pyatspi.ROLE_PASSWORD_TEXT,
                         pyatspi.ROLE_RADIO_BUTTON,
                         pyatspi.ROLE_TEXT] \
-           and self._script.inDocumentContent() \
-           and not self._script.isAriaWidget(obj):
+           and self._script.inDocumentContent():
 
             # We're having to hack around yet another Mozilla bug:
             # https://bugzilla.mozilla.org/show_bug.cgi?id=960241
@@ -237,8 +236,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
 
         if not force and self._script.inDocumentContent(obj):
             doNotSpeak.append(pyatspi.ROLE_TABLE_CELL)
-            if not self._script.isAriaWidget(obj) \
-               and args.get('formatType', 'unfocused') != 'basicWhereAmI':
+            if args.get('formatType', 'unfocused') != 'basicWhereAmI':
                 doNotSpeak.append(pyatspi.ROLE_LIST_ITEM)
                 doNotSpeak.append(pyatspi.ROLE_LIST)
 
@@ -321,8 +319,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         specifications) that represent the default button in a dialog.
         This method should initially be called with a top-level window.
         """
-        if self._script.inDocumentContent(obj) \
-           and not self._script.isAriaWidget(obj):
+        if self._script.inDocumentContent(obj):
             return []
 
         return speech_generator.SpeechGenerator.\
@@ -377,13 +374,9 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
             result.extend(speech_generator.SpeechGenerator.\
                                            generateSpeech(self, obj, **args))
             self._restoreRole(oldRole, args)
-        # ARIA widgets get treated like regular default widgets.
-        #
         else:
-            args['useDefaultFormatting'] = self._script.isAriaWidget(obj)
             result.extend(speech_generator.SpeechGenerator.\
                                            generateSpeech(self, obj, **args))
-            del args['useDefaultFormatting']
         return result
 
     def getAttribute(self, obj, attributeName):