[orca/gnome-3-20] Defer to default name generation for web combo boxes and spin buttons

[Joanmarie Diggs <joanied src gnome org>]

commit 3a20f27b50b7542eb24969e0159357665e200bab
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Apr 20 23:42:46 2016 -0400

    Defer to default name generation for web combo boxes and spin buttons

 src/orca/scripts/web/speech_generator.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/scripts/web/speech_generator.py b/src/orca/scripts/web/speech_generator.py
index 8610091..ae72a85 100644
--- a/src/orca/scripts/web/speech_generator.py
+++ b/src/orca/scripts/web/speech_generator.py
@@ -156,6 +156,12 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         if self._script.utilities.isTextBlockElement(obj):
             return []
 
+        # TODO - JD: Once the formatting strings are vastly cleaned up
+        # or simply removed, hacks like this won't be needed.
+        role = args.get('role', obj.getRole())
+        if role in [pyatspi.ROLE_COMBO_BOX, pyatspi.ROLE_SPIN_BUTTON]:
+            return super()._generateName(obj, **args)
+
         if self._script.utilities.inDocumentContent(obj) and obj.name:
             result = [obj.name]
             result.extend(self.voice(speech_generator.DEFAULT))