AX: <address> element should no longer map to ARIA contentinfo role

https://bugs.webkit.org/show_bug.cgi?id=212617 <rdar://problem/63848604> Reviewed by Joanmarie Diggs. Source/WebCore: Change the mapping of <address> to be a basic group. Update tests. * accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::determineAccessibilityRole): LayoutTests: * accessibility/mac/landmark-not-ignored-expected.txt: * accessibility/mac/landmark-not-ignored.html: * platform/mac-wk2/accessibility/roles-exposed-expected.txt: * platform/mac/accessibility/roles-exposed-expected.txt: * platform/win/accessibility/roles-exposed-expected.txt: Canonical link: https://commits.webkit.org/226033@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263096 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jun 16, 2020 · 6448c986f1857fd971779d67f771a0416869c68c · 6448c98
1 parent a2c1efb
commit 6448c986f1857fd971779d67f771a0416869c68c
Showing 8 changed files with 36 additions and 14 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2020-06-16  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: <address> element should no longer map to ARIA `contentinfo` role
+        https://bugs.webkit.org/show_bug.cgi?id=212617
+        <rdar://problem/63848604>
+
+        Reviewed by Joanmarie Diggs.
+
+        * accessibility/mac/landmark-not-ignored-expected.txt:
+        * accessibility/mac/landmark-not-ignored.html:
+        * platform/mac-wk2/accessibility/roles-exposed-expected.txt:
+        * platform/mac/accessibility/roles-exposed-expected.txt:
+        * platform/win/accessibility/roles-exposed-expected.txt:
+
 2020-06-16  Jason Lawrence  <lawrence.j@apple.com>
 
         [iOS wk2] http/tests/security/cookies/third-party-cookie-blocking-main-frame.html is flaky timing out.

diff --git a/LayoutTests/accessibility/mac/landmark-not-ignored-expected.txt b/LayoutTests/accessibility/mac/landmark-not-ignored-expected.txt
@@ -1,6 +1,5 @@
 header
 aside
-address
 main
 nav
 article
@@ -10,14 +9,12 @@ This tests that HTML5 elements which have implicit landmark and related semantic
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS test.childrenCount is 7
+PASS test.childrenCount is 6
 PASS el.role is "AXRole: AXGroup"
 PASS el.subrole is "AXSubrole: AXLandmarkBanner"
 PASS el.role is "AXRole: AXGroup"
 PASS el.subrole is "AXSubrole: AXLandmarkComplementary"
 PASS el.role is "AXRole: AXGroup"
-PASS el.subrole is "AXSubrole: AXLandmarkContentInfo"
-PASS el.role is "AXRole: AXGroup"
 PASS el.subrole is "AXSubrole: AXLandmarkMain"
 PASS el.role is "AXRole: AXGroup"
 PASS el.subrole is "AXSubrole: AXLandmarkNavigation"

diff --git a/LayoutTests/accessibility/mac/landmark-not-ignored.html b/LayoutTests/accessibility/mac/landmark-not-ignored.html
@@ -8,7 +8,6 @@
 <div id="test" tabindex="-1">
 <header><div>header</div></header>
 <aside><div>aside</div></aside>
-<address><div>address</div></address>
 <main><div>main</div></main>
 <nav><div>nav</div></nav>
 <article><div>article</div></article>
@@ -24,12 +23,11 @@
 
     if (window.accessibilityController) {
         var test = accessibilityController.accessibleElementById("test");
-        shouldBe("test.childrenCount", "7");
+        shouldBe("test.childrenCount", "6");
 
         var subroles = [
             "AXLandmarkBanner",
             "AXLandmarkComplementary",
-            "AXLandmarkContentInfo",
             "AXLandmarkMain",
             "AXLandmarkNavigation",
             "AXDocumentArticle",

diff --git a/LayoutTests/platform/mac-wk2/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/mac-wk2/accessibility/roles-exposed-expected.txt
@@ -26,8 +26,8 @@ abbr[title]
 
 address
       AXRole: AXGroup
-      AXSubrole: AXLandmarkContentInfo
-      AXRoleDescription: content information
+      AXSubrole: 
+      AXRoleDescription: group
 
 article
       AXRole: AXGroup

diff --git a/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt
@@ -26,8 +26,8 @@ abbr[title]
 
 address
       AXRole: AXGroup
-      AXSubrole: AXLandmarkContentInfo
-      AXRoleDescription: content information
+      AXSubrole: 
+      AXRoleDescription: group
 
 article
       AXRole: AXGroup

diff --git a/LayoutTests/platform/win/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/win/accessibility/roles-exposed-expected.txt
@@ -26,8 +26,8 @@ abbr[title]
 
 address
       AXRole: AXGroup
-      AXSubrole: AXLandmarkContentInfo
-      AXRoleDescription: content information
+      AXSubrole: 
+      AXRoleDescription: group
 
 article
       AXRole: AXGroup

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2020-06-16  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: <address> element should no longer map to ARIA `contentinfo` role
+        https://bugs.webkit.org/show_bug.cgi?id=212617
+        <rdar://problem/63848604>
+
+        Reviewed by Joanmarie Diggs.
+
+        Change the mapping of <address> to be a basic group. Update tests.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+
 2020-06-16  Truitt Savell  <tsavell@apple.com>
 
         Unreviewed, reverting r263079.

diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2935,7 +2935,7 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
         return hasAttribute(aria_labelAttr) || hasAttribute(aria_labelledbyAttr) ? AccessibilityRole::LandmarkRegion : AccessibilityRole::TextGroup;
 
     if (node && node->hasTagName(addressTag))
-        return AccessibilityRole::LandmarkContentInfo;
+        return AccessibilityRole::Group;
 
     if (node && node->hasTagName(blockquoteTag))
         return AccessibilityRole::Blockquote;