diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 35bdf4ed8b64..08d455097a1e 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -1473,23 +1473,34 @@ nsAccessible::State() // Apply ARIA states to be sure accessible states will be overridden. ApplyARIAState(&state); - if (mRoleMapEntry && mRoleMapEntry->role == roles::PAGETAB && - !(state & states::SELECTED) && + // If this is an ARIA item of the selectable widget and if it's focused and + // not marked unselected explicitly (i.e. aria-selected="false") then expose + // it as selected to make ARIA widget authors life easier. + if (mRoleMapEntry && !(state & states::SELECTED) && !mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::aria_selected, nsGkAtoms::_false, eCaseMatters)) { - // Special case: for tabs, focused implies selected, unless explicitly - // false, i.e. aria-selected="false". - if (state & states::FOCUSED) { - state |= states::SELECTED; - } else { - // If focus is in a child of the tab panel surely the tab is selected! - Relation rel = RelationByType(nsIAccessibleRelation::RELATION_LABEL_FOR); - nsAccessible* relTarget = nsnull; - while ((relTarget = rel.Next())) { - if (relTarget->Role() == roles::PROPERTYPAGE && - FocusMgr()->IsFocusWithin(relTarget)) - state |= states::SELECTED; + // Special case for tabs: focused tab or focus inside related tab panel + // implies selected state. + if (mRoleMapEntry->role == roles::PAGETAB) { + if (state & states::FOCUSED) { + state |= states::SELECTED; + } else { + // If focus is in a child of the tab panel surely the tab is selected! + Relation rel = RelationByType(nsIAccessibleRelation::RELATION_LABEL_FOR); + nsAccessible* relTarget = nsnull; + while ((relTarget = rel.Next())) { + if (relTarget->Role() == roles::PROPERTYPAGE && + FocusMgr()->IsFocusWithin(relTarget)) + state |= states::SELECTED; + } + } + } else if (state & states::FOCUSED) { + nsAccessible* container = nsAccUtils::GetSelectableContainer(this, state); + if (container && + !nsAccUtils::HasDefinedARIAToken(container->GetContent(), + nsGkAtoms::aria_multiselectable)) { + state |= states::SELECTED; } } } diff --git a/accessible/tests/mochitest/states/Makefile.in b/accessible/tests/mochitest/states/Makefile.in index 1c2d30f4f4a5..e4629217a621 100644 --- a/accessible/tests/mochitest/states/Makefile.in +++ b/accessible/tests/mochitest/states/Makefile.in @@ -48,7 +48,7 @@ include $(topsrcdir)/config/rules.mk _TEST_FILES =\ test_aria.html \ test_aria_imgmap.html \ - test_aria_tabs.html \ + test_aria_widgetitems.html \ test_buttons.html \ test_doc.html \ test_docarticle.html \ diff --git a/accessible/tests/mochitest/states/test_aria_tabs.html b/accessible/tests/mochitest/states/test_aria_tabs.html deleted file mode 100644 index 4ddc82afd9ba..000000000000 --- a/accessible/tests/mochitest/states/test_aria_tabs.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Test ARIA tab accessible selected state - - - - - - - - - - - - - - - Mozilla Bug 653601 - -

- - 
-
- - -
- - - -
- - -
- - - -
- - diff --git a/accessible/tests/mochitest/states/test_aria_widgetitems.html b/accessible/tests/mochitest/states/test_aria_widgetitems.html new file mode 100644 index 000000000000..ade5ed587ac3 --- /dev/null +++ b/accessible/tests/mochitest/states/test_aria_widgetitems.html @@ -0,0 +1,160 @@ + + + + + Test ARIA tab accessible selected state + + + + + + + + + + + + + + + Mozilla Bug 653601 + + + Mozilla Bug 526703 + +

+ + 
+
+ + +
+ + + +
+ + +
+
unselected option
+
selected option
+
focused explicitly unselected option
+
+ + +
+
unselected treeitem
+
selected treeitem
+
focused explicitly unselected treeitem
+
+ + +
+ + + +
+ +