Diff
Modified: trunk/LayoutTests/ChangeLog (259670 => 259671)
--- trunk/LayoutTests/ChangeLog 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/LayoutTests/ChangeLog 2020-04-07 21:14:16 UTC (rev 259671)
@@ -1,3 +1,15 @@
+2020-04-07 Joanmarie Diggs <jdi...@igalia.com>
+
+ AX: Change ATK mapping of the ARIA alert and alertdialog roles
+ https://bugs.webkit.org/show_bug.cgi?id=210121
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/aria-mappings-expected.txt: Updated.
+ * accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
+ * platform/gtk/accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
+ * platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
+
2020-04-07 Wenson Hsieh <wenson_hs...@apple.com>
Preventing touch events should not prevent gestures installed above WKWebView from recognizing
Modified: trunk/LayoutTests/accessibility/aria-mappings-expected.txt (259670 => 259671)
--- trunk/LayoutTests/accessibility/aria-mappings-expected.txt 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/LayoutTests/accessibility/aria-mappings-expected.txt 2020-04-07 21:14:16 UTC (rev 259671)
@@ -17,11 +17,11 @@
role="alert" should give a message with important, and usually time-sensitive, information.
-Role for 'alert' div is: AXRole: AXAlert
+Role for 'alert' div is: AXRole: AXNotification
role="alertdialog" is a dialog which contains an alert message.
-Role for 'alertdialog' div is: AXRole: AXDialog
+Role for 'alertdialog' div is: AXRole: AXAlert
role="article" is a section of a page that consists of a composition that forms an independent part of a document, page, or site
Modified: trunk/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt (259670 => 259671)
--- trunk/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt 2020-04-07 21:14:16 UTC (rev 259671)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-AXRole: AXAlert
+AXRole: AXNotification
AXParent: AXWebArea
AXChildren: 0
AXPosition: { 0.00000, 0.00000 }
@@ -19,10 +19,10 @@
AXEnabled: 1
AXExpanded: 0
AXRequired: 0
-AXChecked: 0
+AXChecked: 0q
AXPlatformAttributes: atomic:true, relevant:additions text, live:assertive, container-live-role:alert, container-atomic:true, container-relevant:additions text, container-live:assertive, computed-role:alert, xml-roles:alert, tag:div, toolkit:WebKitGtk
------------
-AXRole: AXDialog
+AXRole: AXAlert
AXParent: AXWebArea
AXChildren: 0
AXPosition: { 0.00000, 0.00000 }
Modified: trunk/LayoutTests/platform/gtk/accessibility/gtk/xml-roles-exposed-expected.txt (259670 => 259671)
--- trunk/LayoutTests/platform/gtk/accessibility/gtk/xml-roles-exposed-expected.txt 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/LayoutTests/platform/gtk/accessibility/gtk/xml-roles-exposed-expected.txt 2020-04-07 21:14:16 UTC (rev 259671)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-AXRole: AXAlert
+AXRole: AXNotification
AXParent: AXWebArea
AXChildren: 0
AXPosition: { 0.00000, 0.00000 }
@@ -22,7 +22,7 @@
AXChecked: 0
AXPlatformAttributes: atomic:true, relevant:additions text, live:assertive, container-live-role:alert, container-atomic:true, container-relevant:additions text, container-live:assertive, computed-role:alert, xml-roles:alert, tag:div, toolkit:WebKitGtk
------------
-AXRole: AXDialog
+AXRole: AXAlert
AXParent: AXWebArea
AXChildren: 0
AXPosition: { 0.00000, 0.00000 }
Modified: trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt (259670 => 259671)
--- trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2020-04-07 21:14:16 UTC (rev 259671)
@@ -488,10 +488,10 @@
AXRole: AXSection
div[role=alert]
- AXRole: AXAlert
+ AXRole: AXNotification
div[role=alertdialog]
- AXRole: AXDialog
+ AXRole: AXAlert
div[role=application]
AXRole: AXEmbedded
Modified: trunk/Source/WebCore/ChangeLog (259670 => 259671)
--- trunk/Source/WebCore/ChangeLog 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/Source/WebCore/ChangeLog 2020-04-07 21:14:16 UTC (rev 259671)
@@ -1,3 +1,25 @@
+2020-04-07 Joanmarie Diggs <jdi...@igalia.com>
+
+ AX: Change ATK mapping of the ARIA alert and alertdialog roles
+ https://bugs.webkit.org/show_bug.cgi?id=210121
+
+ Reviewed by Chris Fleizach.
+
+ The ARIA alert role is a live region; not a dialog/message box. In contrast,
+ the ATK alert role is for dialogs such as a warning message which should be
+ presented immediately to the user. Because of the similarity in role names,
+ the original mappings in the Core-AAM were not ideal. They have recently
+ been fixed so we need to update our implementation accordingly.
+
+ Changed mappings
+ - alertdialog from ATK_ROLE_DIALOG to ATK_ROLE_ALERT
+ - alert from ATK_ROLE_ALERT to ATK_ROLE_NOTIFICATION
+
+ Updated existing tests to reflect this change.
+
+ * accessibility/atk/WebKitAccessible.cpp:
+ (atkRole):
+
2020-04-07 Antti Koivisto <an...@apple.com>
Make StylePropertyShorthand iterable
Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp (259670 => 259671)
--- trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp 2020-04-07 21:14:16 UTC (rev 259671)
@@ -580,8 +580,9 @@
{
switch (coreObject->roleValue()) {
case AccessibilityRole::ApplicationAlert:
+ return ATK_ROLE_NOTIFICATION;
+ case AccessibilityRole::ApplicationAlertDialog:
return ATK_ROLE_ALERT;
- case AccessibilityRole::ApplicationAlertDialog:
case AccessibilityRole::ApplicationDialog:
return ATK_ROLE_DIALOG;
case AccessibilityRole::ApplicationStatus:
Modified: trunk/Tools/ChangeLog (259670 => 259671)
--- trunk/Tools/ChangeLog 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/Tools/ChangeLog 2020-04-07 21:14:16 UTC (rev 259671)
@@ -1,3 +1,14 @@
+2020-04-07 Joanmarie Diggs <jdi...@igalia.com>
+
+ AX: Change ATK mapping of the ARIA alert and alertdialog roles
+ https://bugs.webkit.org/show_bug.cgi?id=210121
+
+ Reviewed by Chris Fleizach.
+
+ Add support for ATK_ROLE_NOTIFICATION.
+
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+
2020-04-07 Wenson Hsieh <wenson_hs...@apple.com>
Preventing touch events should not prevent gestures installed above WKWebView from recognizing
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (259670 => 259671)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2020-04-07 21:09:43 UTC (rev 259670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2020-04-07 21:14:16 UTC (rev 259671)
@@ -428,6 +428,8 @@
return "AXMenuBar";
case ATK_ROLE_MENU_ITEM:
return "AXMenuItem";
+ case ATK_ROLE_NOTIFICATION:
+ return "AXNotification";
case ATK_ROLE_PAGE_TAB:
return "AXTab";
case ATK_ROLE_PAGE_TAB_LIST:
