Diff
Modified: branches/safari-612-branch/LayoutTests/ChangeLog (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/ChangeLog 2021-11-10 03:28:57 UTC (rev 285556)
@@ -1,5 +1,88 @@
2021-11-09 Alan Coon <alanc...@apple.com>
+ Cherry-pick r285169. rdar://problem/83950623
+
+ AX: WebKit needs to include NSAccessibilityChildrenInNavigationOrderAttribute in accessibilityAttributeNames
+ https://bugs.webkit.org/show_bug.cgi?id=232595
+
+ Patch by Tyler Wilcock <tyle...@apple.com> on 2021-11-02
+ Reviewed by Andres Gonzalez.
+
+ This patch adds NSAccessibilityChildrenInNavigationOrderAttribute
+ (a.k.a. AXChildrenInNavigationOrder) to
+ WebAccessibilityObjectWrapperMac::accessibilityAttributeNames. The Mac
+ wrapper supported this attribute prior to this patch, but we didn't
+ advertise that we supported it because we didn't include it in our
+ exported attribute names.
+
+ Source/WebCore:
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ Add NSAccessibilityChildrenInNavigationOrderAttribute to list of base
+ supported attributes.
+
+ LayoutTests:
+
+ * accessibility/image-link-expected.txt:
+ * accessibility/image-map2-expected.txt:
+ * accessibility/internal-link-anchors2-expected.txt:
+ * accessibility/mac/aria-columnrowheaders-expected.txt:
+ * accessibility/mac/bounds-for-range-expected.txt:
+ * accessibility/mac/document-attributes-expected.txt:
+ * accessibility/mac/document-links-expected.txt:
+ * accessibility/mac/internal-link-anchors-expected.txt:
+ * accessibility/math-multiscript-attributes-expected.txt:
+ * accessibility/table-attributes-expected.txt:
+ * accessibility/table-cell-spans-expected.txt:
+ * accessibility/table-cells-expected.txt:
+ * accessibility/table-detection-expected.txt:
+ * accessibility/table-one-cell-expected.txt:
+ * accessibility/table-sections-expected.txt:
+ * accessibility/table-with-rules-expected.txt:
+ * accessibility/transformed-element-expected.txt:
+ * platform/mac/accessibility/lists-expected.txt:
+ * platform/mac/accessibility/parent-delete-expected.txt:
+ Add expected AXChildrenInNavigationOrder attribute output.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285169 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-02 Tyler Wilcock <tyle...@apple.com>
+
+ AX: WebKit needs to include NSAccessibilityChildrenInNavigationOrderAttribute in accessibilityAttributeNames
+ https://bugs.webkit.org/show_bug.cgi?id=232595
+
+ Reviewed by Andres Gonzalez.
+
+ This patch adds NSAccessibilityChildrenInNavigationOrderAttribute
+ (a.k.a. AXChildrenInNavigationOrder) to
+ WebAccessibilityObjectWrapperMac::accessibilityAttributeNames. The Mac
+ wrapper supported this attribute prior to this patch, but we didn't
+ advertise that we supported it because we didn't include it in our
+ exported attribute names.
+
+ * accessibility/image-link-expected.txt:
+ * accessibility/image-map2-expected.txt:
+ * accessibility/internal-link-anchors2-expected.txt:
+ * accessibility/mac/aria-columnrowheaders-expected.txt:
+ * accessibility/mac/bounds-for-range-expected.txt:
+ * accessibility/mac/document-attributes-expected.txt:
+ * accessibility/mac/document-links-expected.txt:
+ * accessibility/mac/internal-link-anchors-expected.txt:
+ * accessibility/math-multiscript-attributes-expected.txt:
+ * accessibility/table-attributes-expected.txt:
+ * accessibility/table-cell-spans-expected.txt:
+ * accessibility/table-cells-expected.txt:
+ * accessibility/table-detection-expected.txt:
+ * accessibility/table-one-cell-expected.txt:
+ * accessibility/table-sections-expected.txt:
+ * accessibility/table-with-rules-expected.txt:
+ * accessibility/transformed-element-expected.txt:
+ * platform/mac/accessibility/lists-expected.txt:
+ * platform/mac/accessibility/parent-delete-expected.txt:
+ Add expected AXChildrenInNavigationOrder attribute output.
+
+2021-11-09 Alan Coon <alanc...@apple.com>
+
Apply patch. rdar://problem/84116159
2021-11-09 Kate Cheney <katherine_che...@apple.com>
Modified: branches/safari-612-branch/LayoutTests/accessibility/image-link-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/image-link-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/image-link-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -7,6 +7,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXLink: 'Delicious cake'>
AXSize: NSSize: {280, 215}
@@ -41,6 +42,7 @@
AXSubrole: (null)
AXRoleDescription: image
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXImage>
AXSize: NSSize: {280, 210}
Modified: branches/safari-612-branch/LayoutTests/accessibility/image-map2-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/image-map2-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/image-map2-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -4,6 +4,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {784, 36}
@@ -34,6 +35,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXLink>
AXSize: NSSize: {123, 62}
@@ -68,6 +70,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXLink>
AXSize: NSSize: {122, 14}
Modified: branches/safari-612-branch/LayoutTests/accessibility/internal-link-anchors2-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/internal-link-anchors2-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/internal-link-anchors2-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -4,6 +4,7 @@
AXSubrole: (null)
AXRoleDescription: heading
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXHeading: '[ edit ] Tourette syndrome'>
AXSize: NSSize: {769, 23}
@@ -36,6 +37,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {769, 19}
@@ -68,6 +70,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {769, 19}
Modified: branches/safari-612-branch/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -10,6 +10,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {127, 18}
@@ -47,6 +48,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 18}
@@ -84,6 +86,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {55, 18}
@@ -122,6 +125,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 18}
@@ -159,6 +163,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 18}
Modified: branches/safari-612-branch/LayoutTests/accessibility/mac/bounds-for-range-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/mac/bounds-for-range-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/mac/bounds-for-range-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -3,6 +3,7 @@
AXSubrole: (null)
AXRoleDescription: text
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXStaticText>
AXSize: NSSize: {731, 36}
Modified: branches/safari-612-branch/LayoutTests/accessibility/mac/document-attributes-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/mac/document-attributes-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/mac/document-attributes-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -1,6 +1,7 @@
AXRole: AXWebArea
AXRoleDescription: HTML content
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXWebArea>
AXSize: NSSize: {800, 600}
Modified: branches/safari-612-branch/LayoutTests/accessibility/mac/document-links-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/mac/document-links-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/mac/document-links-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -4,6 +4,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXLink>
AXSize: NSSize: {123, 62}
@@ -38,6 +39,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXLink>
AXSize: NSSize: {113, 22}
@@ -72,6 +74,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXLink: 'link 3'>
AXSize: NSSize: {37, 18}
@@ -105,6 +108,7 @@
AXSubrole: (null)
AXRoleDescription: link
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXLink: 'link 4'>
AXSize: NSSize: {37, 18}
Modified: branches/safari-612-branch/LayoutTests/accessibility/mac/internal-link-anchors-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/mac/internal-link-anchors-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/mac/internal-link-anchors-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -4,6 +4,7 @@
AXSubrole: (null)
AXRoleDescription: text
AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
AXHelp:
AXParent: <AXStaticText>
AXSize: NSSize: {64, 18}
Modified: branches/safari-612-branch/LayoutTests/accessibility/math-multiscript-attributes-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/math-multiscript-attributes-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/math-multiscript-attributes-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -12,6 +12,7 @@
AXSubrole: AXMathIdentifier
AXRoleDescription: group
AXChildren:
+AXChildrenInNavigationOrder:
AXHelp:
AXParent:
AXSize: NSSize: {14, 25}
@@ -42,6 +43,7 @@
AXSubrole: AXMathIdentifier
AXRoleDescription: group
AXChildren:
+AXChildrenInNavigationOrder:
AXHelp:
AXParent:
AXSize: NSSize: {10, 19}
@@ -72,6 +74,7 @@
AXSubrole: AXMathIdentifier
AXRoleDescription: group
AXChildren:
+AXChildrenInNavigationOrder:
AXHelp:
AXParent:
AXSize: NSSize: {9, 18}
@@ -102,6 +105,7 @@
AXSubrole: AXMathIdentifier
AXRoleDescription: group
AXChildren:
+AXChildrenInNavigationOrder:
AXHelp:
AXParent:
AXSize: NSSize: {9, 19}
@@ -132,6 +136,7 @@
AXSubrole: AXMathIdentifier
AXRoleDescription: group
AXChildren:
+AXChildrenInNavigationOrder:
AXHelp:
AXParent:
AXSize: NSSize: {10, 18}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-attributes-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-attributes-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-attributes-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -12,6 +12,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {145, 66}
@@ -49,6 +50,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {145, 66}
@@ -86,6 +88,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {71, 66}
@@ -123,6 +126,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {122, 30}
@@ -160,6 +164,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {122, 30}
@@ -201,6 +206,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {92, 60}
@@ -238,6 +244,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 30}
@@ -279,6 +286,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {145, 126}
@@ -313,6 +321,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {145, 126}
@@ -347,6 +356,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {71, 126}
@@ -381,6 +391,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {122, 126}
@@ -415,6 +426,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {122, 126}
@@ -453,6 +465,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {335, 30}
@@ -484,6 +497,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {335, 36}
@@ -515,6 +529,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {335, 30}
@@ -546,6 +561,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {335, 30}
@@ -581,6 +597,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {145, 66}
@@ -618,6 +635,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {71, 66}
@@ -655,6 +673,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {122, 30}
@@ -692,6 +711,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 36}
@@ -729,6 +749,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {69, 36}
@@ -766,6 +787,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {92, 60}
@@ -803,6 +825,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 30}
@@ -840,6 +863,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {71, 30}
@@ -877,6 +901,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 30}
@@ -914,6 +939,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {69, 30}
@@ -951,6 +977,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 30}
@@ -988,6 +1015,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {71, 30}
@@ -1025,6 +1053,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 30}
@@ -1062,6 +1091,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {69, 30}
@@ -1103,6 +1133,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {335, 66}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-cell-spans-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-cell-spans-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-cell-spans-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -12,6 +12,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {239, 78}
@@ -52,6 +53,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {239, 78}
@@ -92,6 +94,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {120, 60}
@@ -132,6 +135,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {120, 60}
@@ -172,6 +176,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {120, 30}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-cells-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-cells-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-cells-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -14,6 +14,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {145, 66}
@@ -52,6 +53,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 36}
@@ -90,6 +92,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {145, 66}
@@ -128,6 +131,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {71, 30}
@@ -166,6 +170,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {54, 30}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-detection-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-detection-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-detection-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -5,6 +5,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {63, 47}
@@ -52,6 +53,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {69, 29}
@@ -98,6 +100,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {29, 21}
@@ -133,6 +136,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {59, 23}
@@ -179,6 +183,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {59, 23}
@@ -225,6 +230,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {59, 43}
@@ -272,6 +278,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {59, 23}
@@ -318,6 +325,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {27, 19}
@@ -353,6 +361,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {27, 19}
@@ -388,6 +397,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {54, 19}
@@ -434,6 +444,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {769, 27}
@@ -469,6 +480,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {130, 19}
@@ -510,6 +522,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {65, 27}
@@ -556,6 +569,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {63, 49}
@@ -603,6 +617,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {29, 21}
@@ -639,6 +654,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 6>
+AXChildrenInNavigationOrder: <array of size 6>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {65, 70}
@@ -687,6 +703,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 6>
+AXChildrenInNavigationOrder: <array of size 6>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {65, 71}
@@ -735,6 +752,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {63, 47}
@@ -782,6 +800,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 26>
+AXChildrenInNavigationOrder: <array of size 26>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {33, 531}
@@ -851,6 +870,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {84, 47}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-one-cell-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-one-cell-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-one-cell-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -5,6 +5,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {135, 90}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-sections-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-sections-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-sections-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -21,6 +21,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -58,6 +59,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -95,6 +97,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -136,6 +139,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -173,6 +177,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -210,6 +215,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -251,6 +257,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {21, 120}
@@ -285,6 +292,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {28, 120}
@@ -319,6 +327,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {29, 120}
@@ -357,6 +366,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -388,6 +398,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -419,6 +430,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -450,6 +462,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -485,6 +498,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -522,6 +536,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -559,6 +574,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -596,6 +612,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -633,6 +650,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -670,6 +688,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -707,6 +726,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -744,6 +764,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -781,6 +802,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -818,6 +840,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -855,6 +878,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -892,6 +916,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -933,6 +958,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {77, 30}
@@ -971,6 +997,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1008,6 +1035,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -1045,6 +1073,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -1086,6 +1115,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1123,6 +1153,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1160,6 +1191,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1201,6 +1233,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {21, 120}
@@ -1235,6 +1268,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {28, 120}
@@ -1269,6 +1303,7 @@
AXSubrole: (null)
AXRoleDescription: column
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXColumn>
AXSize: NSSize: {29, 120}
@@ -1307,6 +1342,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -1338,6 +1374,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -1369,6 +1406,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -1400,6 +1438,7 @@
AXSubrole: (null)
AXRoleDescription: row
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXRow>
AXSize: NSSize: {76, 30}
@@ -1435,6 +1474,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1472,6 +1512,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -1509,6 +1550,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -1546,6 +1588,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1583,6 +1626,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -1620,6 +1664,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -1657,6 +1702,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1694,6 +1740,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -1731,6 +1778,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -1768,6 +1816,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {21, 30}
@@ -1805,6 +1854,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {28, 30}
@@ -1842,6 +1892,7 @@
AXSubrole: (null)
AXRoleDescription: cell
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXCell>
AXSize: NSSize: {29, 30}
@@ -1883,6 +1934,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 3>
+AXChildrenInNavigationOrder: <array of size 3>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {77, 30}
Modified: branches/safari-612-branch/LayoutTests/accessibility/table-with-rules-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/table-with-rules-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/table-with-rules-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -9,6 +9,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {58, 20}
@@ -51,6 +52,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {63, 24}
@@ -93,6 +95,7 @@
AXSubrole: (null)
AXRoleDescription: table
AXChildren: <array of size 4>
+AXChildrenInNavigationOrder: <array of size 4>
AXHelp:
AXParent: <AXTable>
AXSize: NSSize: {57, 20}
@@ -135,6 +138,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {29, 20}
@@ -166,6 +170,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {30, 20}
Modified: branches/safari-612-branch/LayoutTests/accessibility/transformed-element-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/accessibility/transformed-element-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/accessibility/transformed-element-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -3,6 +3,7 @@
AXSubrole: (null)
AXRoleDescription: group
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {291, 123}
Added: branches/safari-612-branch/LayoutTests/platform/mac/accessibility/lists-expected.txt (0 => 285556)
--- branches/safari-612-branch/LayoutTests/platform/mac/accessibility/lists-expected.txt (rev 0)
+++ branches/safari-612-branch/LayoutTests/platform/mac/accessibility/lists-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -0,0 +1,442 @@
+test 1
+test 2
+test 1
+test 2
+term 1
+meaning 2
+term b
+meaning 1
+meaning 2
+
+
+
+
+AXRole: AXList
+AXSubrole: AXContentList
+AXRoleDescription: content list
+AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
+AXHelp:
+AXParent: <AXList>
+AXSize: NSSize: {784, 36}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXList>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXList>
+AXEndTextMarker: <AXList>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXList>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXList>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXSelectedChildren: <array of size 0>
+AXVisibleChildren: <array of size 2>
+AXOrientation: AXVerticalOrientation
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXList
+AXSubrole: AXContentList
+AXRoleDescription: content list
+AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
+AXHelp:
+AXParent: <AXList>
+AXSize: NSSize: {784, 36}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXList>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXList>
+AXEndTextMarker: <AXList>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXList>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXList>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXSelectedChildren: <array of size 0>
+AXVisibleChildren: <array of size 2>
+AXOrientation: AXVerticalOrientation
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXList
+AXSubrole: AXDescriptionList
+AXRoleDescription: description list
+AXChildren: <array of size 5>
+AXChildrenInNavigationOrder: <array of size 5>
+AXHelp:
+AXParent: <AXList>
+AXSize: NSSize: {784, 90}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXList>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXList>
+AXEndTextMarker: <AXList>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXList>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXList>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXSelectedChildren: (null)
+AXVisibleChildren: <array of size 5>
+AXOrientation: AXVerticalOrientation
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: AXEmptyGroup
+AXRoleDescription: group
+AXChildren: <array of size 0>
+AXChildrenInNavigationOrder: <array of size 0>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {784, 72}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+
+
+AXRole: AXGroup
+AXSubrole: (null)
+AXRoleDescription: group
+AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: (null)
+AXRoleDescription: group
+AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+
+
+AXRole: AXGroup
+AXSubrole: (null)
+AXRoleDescription: group
+AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: (null)
+AXRoleDescription: group
+AXChildren: <array of size 2>
+AXChildrenInNavigationOrder: <array of size 2>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXTitleUIElement: (null)
+AXElementBusy: 0
+
+------------
+
+
+AXRole: AXGroup
+AXSubrole: AXTerm
+AXRoleDescription: term
+AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {769, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: AXDescription
+AXRoleDescription: description
+AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: AXTerm
+AXRoleDescription: term
+AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {769, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: AXDescription
+AXRoleDescription: description
+AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXElementBusy: 0
+
+------------
+AXRole: AXGroup
+AXSubrole: AXDescription
+AXRoleDescription: description
+AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
+AXHelp:
+AXParent: <AXGroup>
+AXSize: NSSize: {729, 18}
+AXTitle:
+AXDescription:
+AXValue:
+AXFocused: 0
+AXEnabled: 1
+AXWindow: <AXGroup>
+AXSelectedTextMarkerRange: (null)
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
+AXVisited: 0
+AXLinkedUIElements: <array of size 0>
+AXSelected: 0
+AXBlockQuoteLevel: 0
+AXTopLevelUIElement: <AXGroup>
+AXLanguage:
+AXDOMIdentifier:
+AXDOMClassList: <array of size 0>
+AXFocusableAncestor: <AXGroup>
+AXEditableAncestor: (null)
+AXHighestEditableAncestor: (null)
+AXElementBusy: 0
+
+------------
+
+
+
Modified: branches/safari-612-branch/LayoutTests/platform/mac/accessibility/parent-delete-expected.txt (285555 => 285556)
--- branches/safari-612-branch/LayoutTests/platform/mac/accessibility/parent-delete-expected.txt 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/LayoutTests/platform/mac/accessibility/parent-delete-expected.txt 2021-11-10 03:28:57 UTC (rev 285556)
@@ -2,6 +2,7 @@
AXRole: AXWebArea
AXRoleDescription: HTML content
AXChildren: <array of size 1>
+AXChildrenInNavigationOrder: <array of size 1>
AXHelp:
AXParent: <AXWebArea>
AXSize: NSSize: {800, 600}
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (285555 => 285556)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-11-10 03:28:57 UTC (rev 285556)
@@ -1,5 +1,71 @@
2021-11-09 Alan Coon <alanc...@apple.com>
+ Cherry-pick r285169. rdar://problem/83950623
+
+ AX: WebKit needs to include NSAccessibilityChildrenInNavigationOrderAttribute in accessibilityAttributeNames
+ https://bugs.webkit.org/show_bug.cgi?id=232595
+
+ Patch by Tyler Wilcock <tyle...@apple.com> on 2021-11-02
+ Reviewed by Andres Gonzalez.
+
+ This patch adds NSAccessibilityChildrenInNavigationOrderAttribute
+ (a.k.a. AXChildrenInNavigationOrder) to
+ WebAccessibilityObjectWrapperMac::accessibilityAttributeNames. The Mac
+ wrapper supported this attribute prior to this patch, but we didn't
+ advertise that we supported it because we didn't include it in our
+ exported attribute names.
+
+ Source/WebCore:
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ Add NSAccessibilityChildrenInNavigationOrderAttribute to list of base
+ supported attributes.
+
+ LayoutTests:
+
+ * accessibility/image-link-expected.txt:
+ * accessibility/image-map2-expected.txt:
+ * accessibility/internal-link-anchors2-expected.txt:
+ * accessibility/mac/aria-columnrowheaders-expected.txt:
+ * accessibility/mac/bounds-for-range-expected.txt:
+ * accessibility/mac/document-attributes-expected.txt:
+ * accessibility/mac/document-links-expected.txt:
+ * accessibility/mac/internal-link-anchors-expected.txt:
+ * accessibility/math-multiscript-attributes-expected.txt:
+ * accessibility/table-attributes-expected.txt:
+ * accessibility/table-cell-spans-expected.txt:
+ * accessibility/table-cells-expected.txt:
+ * accessibility/table-detection-expected.txt:
+ * accessibility/table-one-cell-expected.txt:
+ * accessibility/table-sections-expected.txt:
+ * accessibility/table-with-rules-expected.txt:
+ * accessibility/transformed-element-expected.txt:
+ * platform/mac/accessibility/lists-expected.txt:
+ * platform/mac/accessibility/parent-delete-expected.txt:
+ Add expected AXChildrenInNavigationOrder attribute output.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285169 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-02 Tyler Wilcock <tyle...@apple.com>
+
+ AX: WebKit needs to include NSAccessibilityChildrenInNavigationOrderAttribute in accessibilityAttributeNames
+ https://bugs.webkit.org/show_bug.cgi?id=232595
+
+ Reviewed by Andres Gonzalez.
+
+ This patch adds NSAccessibilityChildrenInNavigationOrderAttribute
+ (a.k.a. AXChildrenInNavigationOrder) to
+ WebAccessibilityObjectWrapperMac::accessibilityAttributeNames. The Mac
+ wrapper supported this attribute prior to this patch, but we didn't
+ advertise that we supported it because we didn't include it in our
+ exported attribute names.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ Add NSAccessibilityChildrenInNavigationOrderAttribute to list of base
+ supported attributes.
+
+2021-11-09 Alan Coon <alanc...@apple.com>
+
Cherry-pick r284453. rdar://problem/85034820
cachedCGColor() and nsColor() should return smart pointers
Modified: branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (285555 => 285556)
--- branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2021-11-10 03:28:42 UTC (rev 285555)
+++ branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2021-11-10 03:28:57 UTC (rev 285556)
@@ -1300,6 +1300,7 @@
NSAccessibilitySubroleAttribute,
NSAccessibilityRoleDescriptionAttribute,
NSAccessibilityChildrenAttribute,
+ NSAccessibilityChildrenInNavigationOrderAttribute,
NSAccessibilityHelpAttribute,
NSAccessibilityParentAttribute,
NSAccessibilityPositionAttribute,
