[orca/gnome-3-6] Fix for bug 688057 - A page that hangs orca

[Joanmarie Diggs <joanied src gnome org>]

commit 8c28bcbdfa22d9d13469508487eeccba46e042e1
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun Nov 11 12:17:24 2012 -0500

    Fix for bug 688057 - A page that hangs orca
    
    Add yet another hack to work around broken hierarchies in Gecko.
    In this particular case, when the index in parent is reportedly -1.

 src/orca/scripts/toolkits/Gecko/script.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index f931c0a..1f2327a 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -3429,7 +3429,7 @@ class Script(default.Script):
             lastChild = documentFrame
         while lastChild:
             lastObj = self.findNextObject(lastChild, documentFrame)
-            if lastObj:
+            if lastObj and lastObj != lastChild:
                 lastChild = lastObj
             else:
                 break
@@ -4662,7 +4662,7 @@ class Script(default.Script):
         # [[[TODO: HACK - WDW Gecko's broken hierarchies make this
         # a bit of a challenge.]]]
         #
-        if not nextObj:
+        if not nextObj and obj.getIndexInParent() != -1:
             index = obj.getIndexInParent() + 1
             while index < obj.parent.childCount:
                 child = obj.parent[index]