Title: [160220] trunk
Revision
160220
Author
[email protected]
Date
2013-12-06 05:58:38 -0800 (Fri, 06 Dec 2013)

Log Message

[ATK] Missing aria roles mappings
https://bugs.webkit.org/show_bug.cgi?id=117729

Patch by Lukasz Gajowy <[email protected]> on 2013-12-06
Reviewed by Mario Sanchez Prada.

Source/WebCore:

Added a few mappings from ARIA roles to ATK roles.

Test: accessibility/aria-mappings.html

* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):

Tools:

Added new mappings to AccessibilityUIElementAtk.cpp.

* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

LayoutTests:

Added new test, checking whether ARIA roles to ATK roles mappings work properly.

* accessibility/aria-mappings-expected.txt: Added.
* accessibility/aria-mappings.html: Added.
* platform/mac/accessibility/aria-mappings-expected.txt: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (160219 => 160220)


--- trunk/LayoutTests/ChangeLog	2013-12-06 12:41:44 UTC (rev 160219)
+++ trunk/LayoutTests/ChangeLog	2013-12-06 13:58:38 UTC (rev 160220)
@@ -1,3 +1,16 @@
+2013-12-06  Lukasz Gajowy  <[email protected]>
+
+        [ATK] Missing aria roles mappings
+        https://bugs.webkit.org/show_bug.cgi?id=117729
+
+        Reviewed by Mario Sanchez Prada.
+
+        Added new test, checking whether ARIA roles to ATK roles mappings work properly.
+
+        * accessibility/aria-mappings-expected.txt: Added.
+        * accessibility/aria-mappings.html: Added.
+        * platform/mac/accessibility/aria-mappings-expected.txt: Added.
+
 2013-12-04  Filip Pizlo  <[email protected]>
 
         FTL should use cvttsd2si directly for double-to-int32 conversions

Added: trunk/LayoutTests/accessibility/aria-mappings-expected.txt (0 => 160220)


--- trunk/LayoutTests/accessibility/aria-mappings-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/accessibility/aria-mappings-expected.txt	2013-12-06 13:58:38 UTC (rev 160220)
@@ -0,0 +1,56 @@
+alert role
+alertdialog role
+article role
+dialog role
+document role
+status role
+tooltip role
+tree role
+treeitem role
+
+This tests that each of these ARIA roles have appropriate mappings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role for 'body' is: AXRole: AXWebArea
+
+
+role="alert" should give a message with important, and usually time-sensitive, information.
+Role for 'alert' div is: AXRole: AXAlert
+
+
+role="alertdialog" is a dialog which contains an alert message.
+Role for 'alertdialog' div is: AXRole: AXDialog
+
+
+role="article" is a  section of a page that consists of a composition that forms an independent part of a document, page, or site
+Role for 'article' div is: AXRole: AXDocument
+
+
+role="dialog" is an application window that is designed to interrupt the current processing of an application in order to prompt the user to enter information or require a response.
+Role for 'dialog' div is: AXRole: AXDialog
+
+
+role="document" is a region containing related information that is declared as document content, as opposed to a web application.
+Role for 'document' div is: AXRole: AXDocument
+
+
+role="status" is a container whose content is advisory information for the user but is not important enough to justify an alert, often but not necessarily presented as a status bar.
+Role for 'status' div is: AXRole: AXStatusBar
+
+
+role="tooltip" is a contextual popup that displays a description for an element.
+Role for 'tooltip' div is: AXRole: AXUserInterfaceTooltip
+
+
+role="tree" is a type of list that may contain sub-level nested groups that can be collapsed and expanded.
+Role for 'tree' div is: AXRole: AXTree
+
+
+role="treeitem" is an option item of a tree.
+Role for 'treeitem' div is: AXRole: AXTreeItem
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/accessibility/aria-mappings.html (0 => 160220)


--- trunk/LayoutTests/accessibility/aria-mappings.html	                        (rev 0)
+++ trunk/LayoutTests/accessibility/aria-mappings.html	2013-12-06 13:58:38 UTC (rev 160220)
@@ -0,0 +1,74 @@
+<html>
+
+<head>
+<script src=""
+</head>
+
+<body>
+<div id="alert" role="alert">alert role</div>
+<div id="alertdialog" role="alertdialog">alertdialog role</div>
+<div id="article" role="article">article role</div>
+<div id="dialog" role="dialog">dialog role</div>
+<div id="document" role="document">document role</div>
+<div id="status" role="status">status role</div>
+<div id="tooltip" role="tooltip">tooltip role</div>
+<div id="tree" role="tree">tree role</div>
+<div id="treeitem" role="treeitem">treeitem role</div>
+<br>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+    description("This tests that each of these ARIA roles have appropriate mappings.");
+
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+
+        if (window.accessibilityController) {
+
+            document.body.focus();
+            var body = accessibilityController.focusedElement;
+            debug("Role for 'body' is: " + body.role);
+
+            debug("<br>");
+            debug("role=\"alert\" should give a message with important, and usually time-sensitive, information.");
+            debug("Role for 'alert' div is: " + accessibilityController.accessibleElementById("alert").role);
+
+            debug("<br>");
+            debug("role=\"alertdialog\" is a dialog which contains an alert message.");
+            debug("Role for 'alertdialog' div is: " + accessibilityController.accessibleElementById("alertdialog").role);
+
+            debug("<br>");
+            debug("role=\"article\" is a  section of a page that consists of a composition that forms an independent part of a document, page, or site");
+            debug("Role for 'article' div is: " + accessibilityController.accessibleElementById("article").role);
+
+            debug("<br>");
+            debug("role=\"dialog\" is an application window that is designed to interrupt the current processing of an application in order to prompt the user to enter information or require a response.");
+            debug("Role for 'dialog' div is: " + accessibilityController.accessibleElementById("dialog").role);
+
+            debug("<br>");
+            debug("role=\"document\" is a region containing related information that is declared as document content, as opposed to a web application.");
+            debug("Role for 'document' div is: " + accessibilityController.accessibleElementById("document").role);
+
+            debug("<br>");
+            debug("role=\"status\" is a container whose content is advisory information for the user but is not important enough to justify an alert, often but not necessarily presented as a status bar.");
+            debug("Role for 'status' div is: " + accessibilityController.accessibleElementById("status").role);
+
+            debug("<br>");
+            debug("role=\"tooltip\" is a contextual popup that displays a description for an element.");
+            debug("Role for 'tooltip' div is: " + accessibilityController.accessibleElementById("tooltip").role);
+
+            debug("<br>");
+            debug("role=\"tree\" is a type of list that may contain sub-level nested groups that can be collapsed and expanded.");
+            debug("Role for 'tree' div is: " + accessibilityController.accessibleElementById("tree").role);
+
+            debug("<br>");
+            debug("role=\"treeitem\" is an option item of a tree.");
+            debug("Role for 'treeitem' div is: " + accessibilityController.accessibleElementById("treeitem").role);
+    }
+}
+</script>
+
+<script src=""
+</body>
+</html>

Added: trunk/LayoutTests/platform/mac/accessibility/aria-mappings-expected.txt (0 => 160220)


--- trunk/LayoutTests/platform/mac/accessibility/aria-mappings-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-mappings-expected.txt	2013-12-06 13:58:38 UTC (rev 160220)
@@ -0,0 +1,56 @@
+alert role
+alertdialog role
+article role
+dialog role
+document role
+status role
+tooltip role
+tree role
+treeitem role
+
+This tests that each of these ARIA roles have appropriate mappings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role for 'body' is: AXRole: AXWebArea
+
+
+role="alert" should give a message with important, and usually time-sensitive, information.
+Role for 'alert' div is: AXRole: AXGroup
+
+
+role="alertdialog" is a dialog which contains an alert message.
+Role for 'alertdialog' div is: AXRole: AXGroup
+
+
+role="article" is a  section of a page that consists of a composition that forms an independent part of a document, page, or site
+Role for 'article' div is: AXRole: AXGroup
+
+
+role="dialog" is an application window that is designed to interrupt the current processing of an application in order to prompt the user to enter information or require a response.
+Role for 'dialog' div is: AXRole: AXGroup
+
+
+role="document" is a region containing related information that is declared as document content, as opposed to a web application.
+Role for 'document' div is: AXRole: AXGroup
+
+
+role="status" is a container whose content is advisory information for the user but is not important enough to justify an alert, often but not necessarily presented as a status bar.
+Role for 'status' div is: AXRole: AXGroup
+
+
+role="tooltip" is a contextual popup that displays a description for an element.
+Role for 'tooltip' div is: AXRole: AXGroup
+
+
+role="tree" is a type of list that may contain sub-level nested groups that can be collapsed and expanded.
+Role for 'tree' div is: AXRole: AXOutline
+
+
+role="treeitem" is an option item of a tree.
+Role for 'treeitem' div is: AXRole: AXRow
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Modified: trunk/Source/WebCore/ChangeLog (160219 => 160220)


--- trunk/Source/WebCore/ChangeLog	2013-12-06 12:41:44 UTC (rev 160219)
+++ trunk/Source/WebCore/ChangeLog	2013-12-06 13:58:38 UTC (rev 160220)
@@ -1,3 +1,17 @@
+2013-12-06  Lukasz Gajowy  <[email protected]>
+
+        [ATK] Missing aria roles mappings
+        https://bugs.webkit.org/show_bug.cgi?id=117729
+
+        Reviewed by Mario Sanchez Prada.
+
+        Added a few mappings from ARIA roles to ATK roles.
+
+        Test: accessibility/aria-mappings.html
+
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (atkRole):
+
 2013-11-11  Philippe Normand  <[email protected]>
 
         [GStreamer] webkitwebaudiosrc element needs to emit stream-start, caps and segment events

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (160219 => 160220)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2013-12-06 12:41:44 UTC (rev 160219)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2013-12-06 13:58:38 UTC (rev 160220)
@@ -534,6 +534,13 @@
 static AtkRole atkRole(AccessibilityRole role)
 {
     switch (role) {
+    case ApplicationAlertRole:
+        return ATK_ROLE_ALERT;
+    case ApplicationDialogRole:
+    case ApplicationAlertDialogRole:
+        return ATK_ROLE_DIALOG;
+    case ApplicationStatusRole:
+        return ATK_ROLE_STATUSBAR;
     case UnknownRole:
         return ATK_ROLE_UNKNOWN;
     case AudioRole:
@@ -558,7 +565,10 @@
     case StaticTextRole:
         return ATK_ROLE_TEXT;
     case OutlineRole:
+    case TreeRole:
         return ATK_ROLE_TREE;
+    case TreeItemRole:
+        return ATK_ROLE_TREE_ITEM;
     case MenuBarRole:
         return ATK_ROLE_MENU_BAR;
     case MenuListPopupRole:
@@ -621,8 +631,8 @@
         return ATK_ROLE_IMAGE;
     case ListMarkerRole:
         return ATK_ROLE_TEXT;
-    case WebAreaRole:
-        // return ATK_ROLE_HTML_CONTAINER; // Is this right?
+    case DocumentRole:
+    case DocumentArticleRole:
         return ATK_ROLE_DOCUMENT_FRAME;
     case HeadingRole:
         return ATK_ROLE_HEADING;
@@ -648,6 +658,10 @@
         return ATK_ROLE_SPIN_BUTTON;
     case TabRole:
         return ATK_ROLE_PAGE_TAB;
+    case UserInterfaceTooltipRole:
+        return ATK_ROLE_TOOL_TIP;
+    case WebAreaRole:
+        return ATK_ROLE_DOCUMENT_WEB;
     default:
         return ATK_ROLE_UNKNOWN;
     }

Modified: trunk/Tools/ChangeLog (160219 => 160220)


--- trunk/Tools/ChangeLog	2013-12-06 12:41:44 UTC (rev 160219)
+++ trunk/Tools/ChangeLog	2013-12-06 13:58:38 UTC (rev 160220)
@@ -1,3 +1,15 @@
+2013-12-06  Lukasz Gajowy  <[email protected]>
+
+        [ATK] Missing aria roles mappings
+        https://bugs.webkit.org/show_bug.cgi?id=117729
+
+        Reviewed by Mario Sanchez Prada.
+
+        Added new mappings to AccessibilityUIElementAtk.cpp.
+
+        * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+
 2013-12-06  Csaba Osztrogonác  <[email protected]>
 
         Typo fix after r160218.

Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (160219 => 160220)


--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp	2013-12-06 12:41:44 UTC (rev 160219)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp	2013-12-06 13:58:38 UTC (rev 160220)
@@ -183,6 +183,8 @@
     switch (role) {
     case ATK_ROLE_ALERT:
         return "AXAlert";
+    case ATK_ROLE_DIALOG:
+        return "AXDialog";
     case ATK_ROLE_CANVAS:
         return "AXCanvas";
     case ATK_ROLE_CHECK_BOX:
@@ -194,6 +196,8 @@
     case ATK_ROLE_COMBO_BOX:
         return "AXComboBox";
     case ATK_ROLE_DOCUMENT_FRAME:
+        return "AXDocument";
+    case ATK_ROLE_DOCUMENT_WEB:
         return "AXWebArea";
     case ATK_ROLE_EMBEDDED:
         return "AXEmbedded";
@@ -261,6 +265,8 @@
         return "AXSlider";
     case ATK_ROLE_SPIN_BUTTON:
         return "AXSpinButton";
+    case ATK_ROLE_STATUSBAR:
+        return "AXStatusBar";
     case ATK_ROLE_TABLE:
         return "AXTable";
     case ATK_ROLE_TABLE_CELL:

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (160219 => 160220)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp	2013-12-06 12:41:44 UTC (rev 160219)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp	2013-12-06 13:58:38 UTC (rev 160220)
@@ -272,6 +272,8 @@
     switch (role) {
     case ATK_ROLE_ALERT:
         return "AXAlert";
+    case ATK_ROLE_DIALOG:
+        return "AXDialog";
     case ATK_ROLE_CANVAS:
         return "AXCanvas";
     case ATK_ROLE_CHECK_BOX:
@@ -283,6 +285,8 @@
     case ATK_ROLE_COMBO_BOX:
         return "AXComboBox";
     case ATK_ROLE_DOCUMENT_FRAME:
+        return "AXDocument";
+    case ATK_ROLE_DOCUMENT_WEB:
         return "AXWebArea";
     case ATK_ROLE_EMBEDDED:
         return "AXEmbedded";
@@ -350,6 +354,8 @@
         return "AXSlider";
     case ATK_ROLE_SPIN_BUTTON:
         return "AXSpinButton";
+    case ATK_ROLE_STATUSBAR:
+        return "AXStatusBar";
     case ATK_ROLE_TABLE:
         return "AXTable";
     case ATK_ROLE_TABLE_CELL:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to