[orca/gnome-3-14] Present the description of Gecko objects when those objects are the locusOfFocus

[Joanmarie Diggs <joanied src gnome org>]

commit aaeb05c4b4b81db316f44ed52de20ff6e9e3b26a
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun Sep 14 19:21:34 2014 -0400

    Present the description of Gecko objects when those objects are the locusOfFocus

 .../scripts/toolkits/Gecko/speech_generator.py     |    4 +---
 .../firefox/html_struct_nav_descriptions.py        |    8 ++++----
 test/keystrokes/firefox/line_nav_descriptions.py   |    2 +-
 .../firefox/object_nav_descriptions_down.py        |   12 ++++++------
 .../firefox/object_nav_descriptions_up.py          |   12 ++++++------
 5 files changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py 
b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index c7d46b5..4e85832 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -136,9 +136,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         if that description is different from that of the name and
         label.
         """
-        start = args.get('startOffset')
-        end = args.get('endOffset')
-        if start != None and end != None:
+        if not obj == orca_state.locusOfFocus:
             return []
 
         formatType = args.get('formatType')
diff --git a/test/keystrokes/firefox/html_struct_nav_descriptions.py 
b/test/keystrokes/firefox/html_struct_nav_descriptions.py
index f12398e..76111dd 100644
--- a/test/keystrokes/firefox/html_struct_nav_descriptions.py
+++ b/test/keystrokes/firefox/html_struct_nav_descriptions.py
@@ -16,7 +16,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Foo, Bar, and Baz.'",
      "     VISIBLE:  'Foo, Bar, and Baz.', cursor=1",
      "SPEECH OUTPUT: 'Foo'",
-     "SPEECH OUTPUT: 'link'"]))
+     "SPEECH OUTPUT: 'link Title of the Foo link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("k"))
@@ -25,16 +25,16 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Foo, Bar, and Baz.'",
      "     VISIBLE:  'Foo, Bar, and Baz.', cursor=6",
      "SPEECH OUTPUT: 'Bar'",
-     "SPEECH OUTPUT: 'link'"]))
+     "SPEECH OUTPUT: 'link ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("k"))
 sequence.append(utils.AssertPresentationAction(
     "3. k for next link",
     ["BRAILLE LINE:  'Foo, Bar, and Baz.'",
-     "     VISIBLE:  'Foo, Bar, and Baz.', cursor=1",
+     "     VISIBLE:  'Foo, Bar, and Baz.', cursor=15",
      "SPEECH OUTPUT: 'Baz'",
-     "SPEECH OUTPUT: 'link'"]))
+     "SPEECH OUTPUT: 'link Title of the Baz link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("x"))
diff --git a/test/keystrokes/firefox/line_nav_descriptions.py 
b/test/keystrokes/firefox/line_nav_descriptions.py
index 95fe170..8b5cf7c 100644
--- a/test/keystrokes/firefox/line_nav_descriptions.py
+++ b/test/keystrokes/firefox/line_nav_descriptions.py
@@ -16,7 +16,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Foo, Bar, and Baz.'",
      "     VISIBLE:  'Foo, Bar, and Baz.', cursor=1",
      "SPEECH OUTPUT: 'Foo'",
-     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'link Title of the Foo link.'",
      "SPEECH OUTPUT: ','",
      "SPEECH OUTPUT: 'Bar'",
      "SPEECH OUTPUT: 'link'",
diff --git a/test/keystrokes/firefox/object_nav_descriptions_down.py 
b/test/keystrokes/firefox/object_nav_descriptions_down.py
index 43fe86f..9db4471 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_down.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_down.py
@@ -15,7 +15,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Line Down",
     ["BRAILLE LINE:  'Foo'",
      "     VISIBLE:  'Foo', cursor=1",
-     "SPEECH OUTPUT: 'Foo link'"]))
+     "SPEECH OUTPUT: 'Foo link Title of the Foo link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -31,7 +31,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
     ["BRAILLE LINE:  'Bar'",
      "     VISIBLE:  'Bar', cursor=1",
-     "SPEECH OUTPUT: 'Bar link'"]))
+     "SPEECH OUTPUT: 'Bar link ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -47,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
     ["BRAILLE LINE:  'Baz'",
      "     VISIBLE:  'Baz', cursor=1",
-     "SPEECH OUTPUT: 'Baz link'"]))
+     "SPEECH OUTPUT: 'Baz link Title of the Baz link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -87,7 +87,7 @@ sequence.append(utils.AssertPresentationAction(
     "10. Line Down",
     ["BRAILLE LINE:  '< > Title of the White checkbox check box'",
      "     VISIBLE:  '< > Title of the White checkbox ', cursor=0",
-     "SPEECH OUTPUT: 'Title of the White checkbox check box not checked'"]))
+     "SPEECH OUTPUT: 'Title of the White checkbox check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -143,7 +143,7 @@ sequence.append(utils.AssertPresentationAction(
     "17. Line Down",
     ["BRAILLE LINE:  '< > White check box'",
      "     VISIBLE:  '< > White check box', cursor=0",
-     "SPEECH OUTPUT: 'White check box not checked'"]))
+     "SPEECH OUTPUT: 'White check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -159,7 +159,7 @@ sequence.append(utils.AssertPresentationAction(
     "19. Line Down",
     ["BRAILLE LINE:  '< > Grey check box'",
      "     VISIBLE:  '< > Grey check box', cursor=0",
-     "SPEECH OUTPUT: 'Grey check box not checked'"]))
+     "SPEECH OUTPUT: 'Grey check box not checked Title of the Grey checkbox'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/object_nav_descriptions_up.py 
b/test/keystrokes/firefox/object_nav_descriptions_up.py
index 97c5b9f..9468e8c 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_up.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_up.py
@@ -32,7 +32,7 @@ sequence.append(utils.AssertPresentationAction(
     "3. Line Up",
     ["BRAILLE LINE:  '< > Grey check box'",
      "     VISIBLE:  '< > Grey check box', cursor=0",
-     "SPEECH OUTPUT: 'Grey check box not checked'"]))
+     "SPEECH OUTPUT: 'Grey check box not checked Title of the Grey checkbox'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -66,7 +66,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
     ["BRAILLE LINE:  '< > White check box'",
      "     VISIBLE:  '< > White check box', cursor=0",
-     "SPEECH OUTPUT: 'White check box not checked'"]))
+     "SPEECH OUTPUT: 'White check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -140,7 +140,7 @@ sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
     ["BRAILLE LINE:  '< > Title of the White checkbox check box'",
      "     VISIBLE:  '< > Title of the White checkbox ', cursor=0",
-     "SPEECH OUTPUT: 'Title of the White checkbox check box not checked'"]))
+     "SPEECH OUTPUT: 'Title of the White checkbox check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -180,7 +180,7 @@ sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
     ["BRAILLE LINE:  'Baz'",
      "     VISIBLE:  'Baz', cursor=1",
-     "SPEECH OUTPUT: 'Baz link'"]))
+     "SPEECH OUTPUT: 'Baz link Title of the Baz link.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -196,7 +196,7 @@ sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
     ["BRAILLE LINE:  'Bar'",
      "     VISIBLE:  'Bar', cursor=1",
-     "SPEECH OUTPUT: 'Bar link'"]))
+     "SPEECH OUTPUT: 'Bar link ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -212,7 +212,7 @@ sequence.append(utils.AssertPresentationAction(
     "25. Line Up",
     ["BRAILLE LINE:  'Foo'",
      "     VISIBLE:  'Foo', cursor=1",
-     "SPEECH OUTPUT: 'Foo link'"]))
+     "SPEECH OUTPUT: 'Foo link Title of the Foo link.'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()