forked from mirrors/gecko-dev
Bug 1480058 part 3: Support accessible selection retrieval methods for XUL tabs with aria-multiselectable. r=surkov
The XULSelectControlAccessible selection methods don't handle ARIA selection. Therefore, if aria-multiselectable is set, use the base implementation of the selection retrieval methods. We don't bother overriding the selection setting methods because implementations (e.g. browser tabs) don't support setting of aria-selected by the a11y engine and we still want to be able to set the primary selected item according to XUL. Being able to retrieve multiple selection programmatically is far more important than being able to set it. MozReview-Commit-ID: CmVp9KyieMY --HG-- extra : rebase_source : e3fa93aad4726b322956babb5422dceebfa0fbb2
This commit is contained in:
James Teh
parent
46ba6df249
commit
5a83999558
4 changed files with 151 additions and 0 deletions
|
|
@ -8,4 +8,5 @@ support-files =
|
|||
[test_menu.xul]
|
||||
[test_menulist.xul]
|
||||
[test_select.html]
|
||||
[test_tabs.xul]
|
||||
[test_tree.xul]
|
||||
|
|
|
|||
94
accessible/tests/mochitest/selectable/test_tabs.xul
Normal file
94
accessible/tests/mochitest/selectable/test_tabs.xul
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
|
||||
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="XUL tabs selectable tests">
|
||||
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
|
||||
|
||||
<script type="application/javascript"
|
||||
src="../common.js" />
|
||||
<script type="application/javascript"
|
||||
src="../role.js" />
|
||||
<script type="application/javascript"
|
||||
src="../states.js" />
|
||||
<script type="application/javascript"
|
||||
src="../selectable.js" />
|
||||
|
||||
<script type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// Test
|
||||
|
||||
function doTest()
|
||||
{
|
||||
var id = "tabs_single";
|
||||
ok(isAccessible(id, [nsIAccessibleSelectable]),
|
||||
"No selectable accessible for tabs_single");
|
||||
var select = getAccessible(id, [nsIAccessibleSelectable]);
|
||||
|
||||
testSelectableSelection(select, ["tab_single1"]);
|
||||
|
||||
select.unselectAll();
|
||||
select.addItemToSelection(1); // tab_single2
|
||||
testSelectableSelection(select, ["tab_single2"], "select tab_single2: ");
|
||||
|
||||
id = "tabs_multi";
|
||||
ok(isAccessible(id, [nsIAccessibleSelectable]),
|
||||
"No selectable accessible for tabs_multi");
|
||||
select = getAccessible(id, [nsIAccessibleSelectable]);
|
||||
|
||||
// Make sure both XUL selection and ARIA selection are included.
|
||||
testSelectableSelection(select, ["tab_multi_xul1", "tab_multi_aria"]);
|
||||
|
||||
select.unselectAll();
|
||||
select.addItemToSelection(2); // tab_multi_xul2
|
||||
// We can only affect XUL selection, so ARIA selection won't change.
|
||||
testSelectableSelection(select, ["tab_multi_aria", "tab_multi_xul2"],
|
||||
"select tab_multi_xul2: ");
|
||||
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
addA11yLoadEvent(doTest);
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<hbox flex="1" style="overflow: auto;">
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<a target="_blank"
|
||||
href="https://bugzilla.mozilla.org/show_bug.cgi?id=1480058"
|
||||
title="XUL tabs don't support ARIA selection">
|
||||
Mozilla Bug 1480058
|
||||
</a><br/>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
</div>
|
||||
<pre id="test">
|
||||
</pre>
|
||||
</body>
|
||||
|
||||
<vbox flex="1">
|
||||
<tabbox>
|
||||
<tabs id="tabs_single">
|
||||
<tab id="tab_single1" label="tab1" selected="true"/>
|
||||
<tab id="tab_single2" label="tab2"/>
|
||||
</tabs>
|
||||
</tabbox>
|
||||
|
||||
<tabbox>
|
||||
<tabs id="tabs_multi" aria-multiselectable="true">
|
||||
<tab id="tab_multi_xul1" label="tab1" selected="true"/>
|
||||
<tab id="tab_multi_aria" label="tab2" aria-selected="true"/>
|
||||
<tab id="tab_multi_xul2" label="tab3"/>
|
||||
</tabs>
|
||||
</tabbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
</window>
|
||||
|
|
@ -181,6 +181,56 @@ XULTabsAccessible::ApplyARIAState(uint64_t* aState) const
|
|||
aria::MapToState(aria::eARIAMultiSelectable, Elm(), aState);
|
||||
}
|
||||
|
||||
// XUL tabs is a single selection control and doesn't allow ARIA selection.
|
||||
// However, if aria-multiselectable is used, it becomes a multiselectable
|
||||
// control, where both native and ARIA markup are used to set selection.
|
||||
// Therefore, if aria-multiselectable is set, use the base implementation of
|
||||
// the selection retrieval methods in order to support ARIA selection.
|
||||
// We don't bother overriding the selection setting methods because
|
||||
// current front-end code using XUL tabs doesn't support setting of
|
||||
// aria-selected by the a11y engine and we still want to be able to set the
|
||||
// primary selected item according to XUL.
|
||||
|
||||
void
|
||||
XULTabsAccessible::SelectedItems(nsTArray<Accessible*>* aItems)
|
||||
{
|
||||
if (nsAccUtils::IsARIAMultiSelectable(this)) {
|
||||
AccessibleWrap::SelectedItems(aItems);
|
||||
} else {
|
||||
XULSelectControlAccessible::SelectedItems(aItems);
|
||||
}
|
||||
}
|
||||
|
||||
Accessible*
|
||||
XULTabsAccessible::GetSelectedItem(uint32_t aIndex)
|
||||
{
|
||||
if (nsAccUtils::IsARIAMultiSelectable(this)) {
|
||||
return AccessibleWrap::GetSelectedItem(aIndex);
|
||||
}
|
||||
|
||||
return XULSelectControlAccessible::GetSelectedItem(aIndex);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
XULTabsAccessible::SelectedItemCount()
|
||||
{
|
||||
if (nsAccUtils::IsARIAMultiSelectable(this)) {
|
||||
return AccessibleWrap::SelectedItemCount();
|
||||
}
|
||||
|
||||
return XULSelectControlAccessible::SelectedItemCount();
|
||||
}
|
||||
|
||||
bool
|
||||
XULTabsAccessible::IsItemSelected(uint32_t aIndex)
|
||||
{
|
||||
if (nsAccUtils::IsARIAMultiSelectable(this)) {
|
||||
return AccessibleWrap::IsItemSelected(aIndex);
|
||||
}
|
||||
|
||||
return XULSelectControlAccessible::IsItemSelected(aIndex);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// XULTabpanelsAccessible
|
||||
|
|
|
|||
|
|
@ -54,6 +54,12 @@ public:
|
|||
// ActionAccessible
|
||||
virtual uint8_t ActionCount() const override;
|
||||
|
||||
// SelectAccessible
|
||||
virtual void SelectedItems(nsTArray<Accessible*>* aItems) override;
|
||||
virtual uint32_t SelectedItemCount() override;
|
||||
virtual Accessible* GetSelectedItem(uint32_t aIndex) override;
|
||||
virtual bool IsItemSelected(uint32_t aIndex) override;
|
||||
|
||||
protected:
|
||||
// Accessible
|
||||
virtual ENameValueFlag NativeName(nsString& aName) const override;
|
||||
|
|
|
|||
Loading…
Reference in a new issue