wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 786566 - ARIA menuitem acting as submenu should have PARENT_MENUITEM role, r=tbsaunde

Browse Source
This commit is contained in:
James Kitchener 2012-11-08 08:58:22 +09:00
parent 9c284b5416
commit b460d1335c
3 changed files with 101 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accessible/src/generic/Accessible.cpp
View File

@ -1734,6 +1734,13 @@ Accessible::ARIATransformRole(role aRole)
} else if (aRole == roles::OPTION) {
if (mParent && mParent->Role() == roles::COMBOBOX_LIST)
return roles::COMBOBOX_OPTION;
} else if (aRole == roles::MENUITEM) {
// Menuitem has a submenu.
if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::aria_haspopup,
nsGkAtoms::_true, eCaseMatters)) {
return roles::PARENT_MENUITEM;
}
}
return aRole;

1
accessible/tests/mochitest/tree/Makefile.in
View File

@ -16,6 +16,7 @@ MOCHITEST_A11Y_FILES =\
$(warning test_applicationacc.xul temporarily disabled, see bug 561508) \
test_aria_globals.html \
test_aria_imgmap.html \
test_aria_menu.html \
test_aria_presentation.html \
test_brokencontext.html \
test_button.xul \

93
accessible/tests/mochitest/tree/test_aria_menu.html Normal file
View File

@ -0,0 +1,93 @@
<!DOCTYPE html>
<html>
<head>
<title>Test accessible tree when ARIA role menuitem is used</title>
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript"
src="../common.js"></script>
<script type="application/javascript"
src="../role.js"></script>
<script type="application/javascript">
function doTest()
{
// Menuitem with no popup.
tree =
{ SECTION: [ // container
{ MENUPOPUP: [ // menu
{ MENUITEM: [
{ STATICTEXT: [] }, // bullet
{ TEXT_LEAF: [] }
] }
] }
] }
testAccessibleTree("menu", tree);
// Menuitem with explicit no popup.
tree =
{ SECTION: [ // container
{ MENUPOPUP: [ // menu
{ MENUITEM: [
{ STATICTEXT: [] }, // bullet
{ TEXT_LEAF: [] }
] }
] }
] }
testAccessibleTree("menu_nopopup", tree);
// Menuitem with popup.
tree =
{ SECTION: [ // container
{ MENUPOPUP: [ // menu
{ PARENT_MENUITEM: [ // menuitem with aria-haspopup="true"
{ STATICTEXT: [] }, // bullet
{ TEXT_LEAF: [] }
] }
] }
] }
testAccessibleTree("menu_popup", tree);
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
addA11yLoadEvent(doTest);
</script>
</head>
<body>
<a target="_blank"
href="https://bugzilla.mozilla.org/show_bug.cgi?id=786566"
title="ARIA menuitem acting as submenu should have PARENT_MENUITEM role">
Mozilla Bug 786566
</a>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
</pre>
<div id="menu">
<ul role="menu">
<li role="menuitem">Normal Menu</li>
</ul>
</div>
<div id="menu_nopopup">
<ul role="menu">
<li role="menuitem" aria-haspopup="false">Menu with explicit no popup</li>
</ul>
</div>
<div id="menu_popup">
<ul role="menu">
<li role="menuitem" aria-haspopup="true">Menu with popup</li>
</ul>
</div>
</body>
</html>