Title: [223504] releases/WebKitGTK/webkit-2.18
- Revision
- 223504
- Author
- [email protected]
- Date
- 2017-10-17 02:39:52 -0700 (Tue, 17 Oct 2017)
Log Message
Merge r222822 - AX: [ATK] ARIA menuitems should be exposed with ATK_ROLE_MENU_ITEM even when it's the child of group role
https://bugs.webkit.org/show_bug.cgi?id=177811
Reviewed by Chris Fleizach.
Source/WebCore:
AccessibilityNodeObject::remapAriaRoleDueToParent() remaps ARIA menuitems to the
MenuButtonRole AccessibilityRole when the menuitem's parent is an ARIA group, but
the ATK code was not handling that remapped role value. As a result, the element
was being exposed as ATK_ROLE_UNKNOWN. Add MenuButtonRole to the AccessibilityRole
types exposed as ATK_ROLE_MENU_ITEM.
Test: accessibility/gtk/menu-with-group-child-tree.html
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):
LayoutTests:
* accessibility/gtk/menu-with-group-child-tree-expected.txt: Added.
* accessibility/gtk/menu-with-group-child-tree.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog (223503 => 223504)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-10-17 09:38:56 UTC (rev 223503)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-10-17 09:39:52 UTC (rev 223504)
@@ -1,5 +1,15 @@
2017-10-03 Joanmarie Diggs <[email protected]>
+ AX: [ATK] ARIA menuitems should be exposed with ATK_ROLE_MENU_ITEM even when it's the child of group role
+ https://bugs.webkit.org/show_bug.cgi?id=177811
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/gtk/menu-with-group-child-tree-expected.txt: Added.
+ * accessibility/gtk/menu-with-group-child-tree.html: Added.
+
+2017-10-03 Joanmarie Diggs <[email protected]>
+
AX: [ATK] aria-rowindex set on row element is not being exposed
https://bugs.webkit.org/show_bug.cgi?id=177821
Added: releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/menu-with-group-child-tree-expected.txt (0 => 223504)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/menu-with-group-child-tree-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/menu-with-group-child-tree-expected.txt 2017-10-17 09:39:52 UTC (rev 223504)
@@ -0,0 +1,13 @@
+AXRole: AXMenu AXTitle:
+ AXRole: AXGroup AXTitle:
+ AXRole: AXMenuItem AXTitle: content 1
+ AXRole: AXMenuItem AXTitle: content 2
+This verifies the accessibility tree of a menu with a group child.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/menu-with-group-child-tree.html (0 => 223504)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/menu-with-group-child-tree.html (rev 0)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/menu-with-group-child-tree.html 2017-10-17 09:39:52 UTC (rev 223504)
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+<script src=""
+</head>
+<body id="body">
+<div id="content">
+ <div role="menu" id="menu">
+ <div role="group"><div role="menuitem">content 1</div></div>
+ <div role="menuitem">content 2</div>
+ </div>
+</div>
+</div>
+<pre id="tree"></pre>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+ description("This verifies the accessibility tree of a menu with a group child.");
+ if (window.accessibilityController) {
+ var menu = accessibilityController.accessibleElementById("menu");
+ dumpAccessibilityTree(menu, null, 0, false, true);
+ }
+ document.getElementById("content").style.visibility = "hidden";
+</script>
+<script src=""
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (223503 => 223504)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-17 09:38:56 UTC (rev 223503)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-17 09:39:52 UTC (rev 223504)
@@ -1,5 +1,23 @@
2017-10-03 Joanmarie Diggs <[email protected]>
+ AX: [ATK] ARIA menuitems should be exposed with ATK_ROLE_MENU_ITEM even when it's the child of group role
+ https://bugs.webkit.org/show_bug.cgi?id=177811
+
+ Reviewed by Chris Fleizach.
+
+ AccessibilityNodeObject::remapAriaRoleDueToParent() remaps ARIA menuitems to the
+ MenuButtonRole AccessibilityRole when the menuitem's parent is an ARIA group, but
+ the ATK code was not handling that remapped role value. As a result, the element
+ was being exposed as ATK_ROLE_UNKNOWN. Add MenuButtonRole to the AccessibilityRole
+ types exposed as ATK_ROLE_MENU_ITEM.
+
+ Test: accessibility/gtk/menu-with-group-child-tree.html
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole):
+
+2017-10-03 Joanmarie Diggs <[email protected]>
+
AX: [ATK] aria-rowindex set on row element is not being exposed
https://bugs.webkit.org/show_bug.cgi?id=177821
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (223503 => 223504)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-10-17 09:38:56 UTC (rev 223503)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-10-17 09:39:52 UTC (rev 223504)
@@ -650,6 +650,7 @@
return ATK_ROLE_MENU;
case MenuListOptionRole:
case MenuItemRole:
+ case MenuButtonRole:
return ATK_ROLE_MENU_ITEM;
case MenuItemCheckboxRole:
return ATK_ROLE_CHECK_MENU_ITEM;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
