Bug 812515 - Land on static text if it is not a list bullet item. r=davidb

accessible/src/jsat/TraversalRules.jsm

@@ -50,10 +50,7 @@ var gSimpleTraversalRoles =
    Ci.nsIAccessibleRole.ROLE_LINK,
    Ci.nsIAccessibleRole.ROLE_PAGETAB,
    Ci.nsIAccessibleRole.ROLE_GRAPHIC,
-   // XXX: Find a better solution for ROLE_STATICTEXT.
-   // It allows to filter list bullets but at the same time it
-   // filters CSS generated content too as an unwanted side effect.
-   // Ci.nsIAccessibleRole.ROLE_STATICTEXT,
+   Ci.nsIAccessibleRole.ROLE_STATICTEXT,
    Ci.nsIAccessibleRole.ROLE_TEXT_LEAF,
    Ci.nsIAccessibleRole.ROLE_PUSHBUTTON,
    Ci.nsIAccessibleRole.ROLE_CHECKBUTTON,
@@ -95,6 +92,16 @@ this.TraversalRules = {
           return Ci.nsIAccessibleTraversalRule.FILTER_MATCH;
         else
           return Ci.nsIAccessibleTraversalRule.FILTER_IGNORE;
+      case Ci.nsIAccessibleRole.ROLE_STATICTEXT:
+        {
+          let parent = aAccessible.parent;
+          // Ignore prefix static text in list items. They are typically bullets or numbers.
+          if (parent.childCount > 1 && aAccessible.indexInParent == 0 &&
+              parent.role == Ci.nsIAccessibleRole.ROLE_LISTITEM)
+            return Ci.nsIAccessibleTraversalRule.FILTER_IGNORE;
+
+          return Ci.nsIAccessibleTraversalRule.FILTER_MATCH;
+        }
       default:
         // Ignore the subtree, if there is one. So that we don't land on
         // the same content that was already presented by its parent.