Title: [223508] releases/WebKitGTK/webkit-2.18
- Revision
- 223508
- Author
- [email protected]
- Date
- 2017-10-17 02:49:43 -0700 (Tue, 17 Oct 2017)
Log Message
Merge r222833 - AX: [ATK] aria-pressed="mixed" should be exposed via ATK_STATE_INDETERMINATE
https://bugs.webkit.org/show_bug.cgi?id=177807
Reviewed by Chris Fleizach.
Source/WebCore:
Include toggle buttons in the element types for which the mixed state is checked
and exposed via ATK_STATE_INDETERMINATE if found. Also only do the role checks when
AccessibilityObject::isIndeterminate() has returned false.
Test: accessibility/gtk/aria-pressed-mixed-value.html
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(setAtkStateSetFromCoreObject):
LayoutTests:
* accessibility/gtk/aria-pressed-mixed-value-expected.txt: Added.
* accessibility/gtk/aria-pressed-mixed-value.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog (223507 => 223508)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-10-17 09:48:50 UTC (rev 223507)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-10-17 09:49:43 UTC (rev 223508)
@@ -1,5 +1,15 @@
2017-10-04 Joanmarie Diggs <[email protected]>
+ AX: [ATK] aria-pressed="mixed" should be exposed via ATK_STATE_INDETERMINATE
+ https://bugs.webkit.org/show_bug.cgi?id=177807
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/gtk/aria-pressed-mixed-value-expected.txt: Added.
+ * accessibility/gtk/aria-pressed-mixed-value.html: Added.
+
+2017-10-04 Joanmarie Diggs <[email protected]>
+
AX: [ATK] ARIA tabpanel role should be exposed as ATK_ROLE_SCROLL_PANE
https://bugs.webkit.org/show_bug.cgi?id=177815
Added: releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-pressed-mixed-value-expected.txt (0 => 223508)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-pressed-mixed-value-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-pressed-mixed-value-expected.txt 2017-10-17 09:49:43 UTC (rev 223508)
@@ -0,0 +1,12 @@
+Verifies the exposure of a mixed value of aria-pressed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+test1: AXRole: AXToggleButton is indeterminate: true
+test2: AXRole: AXToggleButton is indeterminate: false
+test3: AXRole: AXToggleButton is indeterminate: false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-pressed-mixed-value.html (0 => 223508)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-pressed-mixed-value.html (rev 0)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-pressed-mixed-value.html 2017-10-17 09:49:43 UTC (rev 223508)
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body id="body">
+<div id="content">
+ <div id="test1" role="button" aria-pressed="mixed"></div>
+ <div id="test2" role="button" aria-pressed="true"></div>
+ <div id="test3" role="button" aria-pressed="false"></div>
+</div>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+ description("Verifies the exposure of a mixed value of aria-pressed.");
+ if (window.accessibilityController) {
+ for (var i = 1; i <= 3; i++) {
+ var axElement = accessibilityController.accessibleElementById("test" + i);
+ debug("test" + i + ": " + axElement.role + " is indeterminate: " + axElement.isIndeterminate);
+ }
+ document.getElementById("content").style.visibility = "hidden";
+ }
+</script>
+<script src=""
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (223507 => 223508)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-17 09:48:50 UTC (rev 223507)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-17 09:49:43 UTC (rev 223508)
@@ -1,5 +1,21 @@
2017-10-04 Joanmarie Diggs <[email protected]>
+ AX: [ATK] aria-pressed="mixed" should be exposed via ATK_STATE_INDETERMINATE
+ https://bugs.webkit.org/show_bug.cgi?id=177807
+
+ Reviewed by Chris Fleizach.
+
+ Include toggle buttons in the element types for which the mixed state is checked
+ and exposed via ATK_STATE_INDETERMINATE if found. Also only do the role checks when
+ AccessibilityObject::isIndeterminate() has returned false.
+
+ Test: accessibility/gtk/aria-pressed-mixed-value.html
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (setAtkStateSetFromCoreObject):
+
+2017-10-04 Joanmarie Diggs <[email protected]>
+
AX: [ATK] ARIA tabpanel role should be exposed as ATK_ROLE_SCROLL_PANE
https://bugs.webkit.org/show_bug.cgi?id=177815
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (223507 => 223508)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-10-17 09:48:50 UTC (rev 223507)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-10-17 09:49:43 UTC (rev 223508)
@@ -954,8 +954,7 @@
if (coreObject->isIndeterminate())
atk_state_set_add_state(stateSet, ATK_STATE_INDETERMINATE);
-
- if (coreObject->isCheckboxOrRadio() || coreObject->isMenuItem()) {
+ else if (coreObject->isCheckboxOrRadio() || coreObject->isMenuItem() || coreObject->isToggleButton()) {
if (coreObject->checkboxOrRadioValue() == ButtonStateMixed)
atk_state_set_add_state(stateSet, ATK_STATE_INDETERMINATE);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
