[ATK] Implement support for DPub ARIA roles
https://bugs.webkit.org/show_bug.cgi?id=170679
Reviewed by Chris Fleizach.
Source/WebCore:
Create two new WebCore AccessibilityRole values: TextGroup and ApplicationTextGroup.
These roles make it possible for platforms to distinguish groups which are primarily
intended to display textual content from groups which are primarily intended to hold
user-interface objects. Use these roles to fix the ATK mapping of DPub's groups, which
should be exposed as ATK_ROLE_SECTION; not ATK_ROLE_PANEL.
Modify the following WebCore AccessibilityRole mappings:
- doc-abstract changed to ApplicationTextGroupRole because this DPub ARIA role does
not subclass the ARIA landmark role
- doc-biblioentry and doc-endnote changed to ListItemRole, because these DPub ARIA
roles subclass the ARIA listitem role
- doc-notice and doc-tip changed to DocumentNoteRole because these DPub ARIA roles
subclass the ARIA note role
- doc-pagebreak changed to SplitterRole because this DPub ARIA role subclasses the
ARIA separator role
No new tests required: New test cases were added to xml-roles-exposed.html, and
the platform expectations for roles-exposed.html were updated to reflect the
correct mappings.
* accessibility/AccessibilityList.cpp:
(WebCore::AccessibilityList::determineAccessibilityRole):
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::isGroup):
(WebCore::AccessibilityNodeObject::helpText):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::ariaTreeItemContent):
(WebCore::initializeRoleMap):
(WebCore::AccessibilityObject::computedRoleString):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::helpText):
(WebCore::AccessibilityRenderObject::shouldFocusActiveDescendant):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleGetAttributes):
(atkRole):
(roleIsTextType):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
(-[WebAccessibilityObjectWrapper containsUnnaturallySegmentedChildren]):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper subrole]):
Tools:
Add DPub ARIA landmark roles to roleToString().
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
LayoutTests:
Update tests and expectations to reflect the modified WebCore Accessibility
role mappings, and the corresponding changes for the platforms.
* accessibility/gtk/xml-roles-exposed-expected.txt:
* accessibility/gtk/xml-roles-exposed.html:
* accessibility/roles-exposed.html:
* inspector/dom/getAccessibilityPropertiesForNode-expected.txt:
* platform/gtk/TestExpectations:
* platform/gtk/accessibility/roles-exposed-expected.txt:
* platform/mac/accessibility/roles-exposed-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215554 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
index a354041..e35247b 100644
--- a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
@@ -427,15 +427,20 @@
// According to the W3C Core Accessibility API Mappings 1.1, section 5.4.1 General Rules:
// "User agents must expose the WAI-ARIA role string if the API supports a mechanism to do so."
// In the case of ATK, the mechanism to do so is an object attribute pair (xml-roles:"string").
- // The computedRoleString is primarily for testing, and not limited to elements with ARIA roles.
- // Because the computedRoleString currently contains the ARIA role string, we'll use it for
- // both purposes, as the "computed-role" object attribute for all elements which have a value
- // and also via the "xml-roles" attribute for elements with ARIA, as well as for landmarks.
- String roleString = coreObject->computedRoleString();
- if (!roleString.isEmpty()) {
- if (coreObject->ariaRoleAttribute() != UnknownRole || coreObject->isLandmark())
- attributeSet = addToAtkAttributeSet(attributeSet, "xml-roles", roleString.utf8().data());
- attributeSet = addToAtkAttributeSet(attributeSet, "computed-role", roleString.utf8().data());
+ // We cannot use the computedRoleString for this purpose because it is not limited to elements
+ // with ARIA roles, and it might not contain the actual ARIA role value (e.g. DPub ARIA).
+ String roleString = coreObject->getAttribute(HTMLNames::roleAttr);
+ if (!roleString.isEmpty())
+ attributeSet = addToAtkAttributeSet(attributeSet, "xml-roles", roleString.utf8().data());
+
+ String computedRoleString = coreObject->computedRoleString();
+ if (!computedRoleString.isEmpty()) {
+ attributeSet = addToAtkAttributeSet(attributeSet, "computed-role", computedRoleString.utf8().data());
+
+ // The HTML AAM maps several elements to ARIA landmark roles. In order for the type of landmark
+ // to be obtainable in the same fashion as an ARIA landmark, fall back on the computedRoleString.
+ if (coreObject->ariaRoleAttribute() == UnknownRole && coreObject->isLandmark())
+ attributeSet = addToAtkAttributeSet(attributeSet, "xml-roles", computedRoleString.utf8().data());
}
String roleDescription = coreObject->roleDescription();
@@ -544,13 +549,12 @@
return ATK_ROLE_TABLE;
case ApplicationRole:
return ATK_ROLE_APPLICATION;
+ case ApplicationGroupRole:
+ case GroupRole:
case RadioGroupRole:
case SVGRootRole:
case TabPanelRole:
return ATK_ROLE_PANEL;
- case ApplicationGroupRole:
- case GroupRole:
- return coreObject->isStyleFormatGroup() ? ATK_ROLE_SECTION : ATK_ROLE_PANEL;
case RowHeaderRole:
return ATK_ROLE_ROW_HEADER;
case ColumnHeaderRole:
@@ -596,9 +600,11 @@
#if ATK_CHECK_VERSION(2, 11, 3)
return ATK_ROLE_BLOCK_QUOTE;
#endif
+ case ApplicationTextGroupRole:
case DivRole:
case PreRole:
case SVGTextRole:
+ case TextGroupRole:
return ATK_ROLE_SECTION;
case FooterRole:
return ATK_ROLE_FOOTER;
@@ -1064,7 +1070,7 @@
{
return role == ParagraphRole || role == HeadingRole || role == DivRole || role == CellRole
|| role == LinkRole || role == WebCoreLinkRole || role == ListItemRole || role == PreRole
- || role == GridCellRole;
+ || role == GridCellRole || role == TextGroupRole || role == ApplicationTextGroupRole;
}
static guint16 getInterfaceMaskFromObject(AccessibilityObject* coreObject)
