Changeset 241983 in webkit

Timestamp:

Feb 22, 2019 8:31:33 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

AX: Treat AXChildrenInNavigationOrder as AXChildren before adding support for aria-flowto
​https://bugs.webkit.org/show_bug.cgi?id=194923

Patch by Eric Liang <​ericliang@apple.com> on 2019-02-22
Reviewed by Chris Fleizach.

Source/WebCore:

Added AXChildrenInNavigationOrder attribute that returns the same array as from AXChildren. It prevents AppKit from reordering elements from the fallback AXChildren attribute.

Test: accessibility/mac/children-in-navigation-order-returns-children.html

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

LayoutTests:

Added test to check AXChildrenInNavigationOrder returns non-empty array from AXChildren.

• accessibility/mac/children-in-navigation-order-returns-children-expected.txt: Added.
• accessibility/mac/children-in-navigation-order-returns-children.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/children-in-navigation-order-returns-children-expected.txt (added)
• LayoutTests/accessibility/mac/children-in-navigation-order-returns-children.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-02-22  Eric Liang  <ericliang@apple.com>
+
+        AX: Treat AXChildrenInNavigationOrder as AXChildren before adding support for aria-flowto
+        https://bugs.webkit.org/show_bug.cgi?id=194923
+
+        Reviewed by Chris Fleizach.
+
+        Added test to check AXChildrenInNavigationOrder returns non-empty array from AXChildren.
+        * accessibility/mac/children-in-navigation-order-returns-children-expected.txt: Added.
+        * accessibility/mac/children-in-navigation-order-returns-children.html: Added.
+
 2019-02-22  Basuke Suzuki  <basuke.suzuki@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-22  Eric Liang  <ericliang@apple.com>
+
+        AX: Treat AXChildrenInNavigationOrder as AXChildren before adding support for aria-flowto
+        https://bugs.webkit.org/show_bug.cgi?id=194923
+
+        Reviewed by Chris Fleizach.
+
+        Added AXChildrenInNavigationOrder attribute that returns the same array as from AXChildren. It prevents AppKit from reordering elements from the fallback AXChildren attribute.
+
+        Test: accessibility/mac/children-in-navigation-order-returns-children.html
+
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
 2019-02-22  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -152 +152 @@
 #ifndef NSAccessibilityBlockQuoteLevelAttribute
 #define NSAccessibilityBlockQuoteLevelAttribute @"AXBlockQuoteLevel"
+#endif
+
+#ifndef NSAccessibilityChildrenInNavigationOrderAttribute
+#define NSAccessibilityChildrenInNavigationOrderAttribute @"AXChildrenInNavigationOrder"
 #endif
 
@@ -2483 +2487 @@
     }
     
-    if ([attributeName isEqualToString: NSAccessibilityChildrenAttribute]) {
+    if ([attributeName isEqualToString: NSAccessibilityChildrenAttribute] || [attributeName isEqualToString: NSAccessibilityChildrenInNavigationOrderAttribute]) {
         if (!self.childrenVectorSize) {
             NSArray* children = [self renderWidgetChildren];