From d30cbb29738ed0229ccf8a6dab4e2bdf8fb53ac3 Mon Sep 17 00:00:00 2001
From: Marco Zehe <mzehe@mozilla.com>
Date: Wed, 14 Aug 2019 06:10:24 +0000
Subject: [PATCH] Bug 1573750 - If header or footer elements are descendants of
 the main element, do not expose them as landmarks, r=Jamie

Differential Revision: https://phabricator.services.mozilla.com/D41893

--HG--
extra : moz-landing-system : lando
---
 accessible/html/HTMLElementAccessibles.cpp    | 10 +++++-----
 .../mochitest/attributes/test_xml-roles.html  |  6 ++++++
 .../tests/mochitest/elm/test_HTMLSpec.html    |  8 ++++++++
 .../tests/mochitest/jsat/test_landmarks.html  | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/accessible/html/HTMLElementAccessibles.cpp b/accessible/html/HTMLElementAccessibles.cpp
index b01c880a90ea..6083636cd8b5 100644
--- a/accessible/html/HTMLElementAccessibles.cpp
+++ b/accessible/html/HTMLElementAccessibles.cpp
@@ -165,11 +165,11 @@ role HTMLHeaderOrFooterAccessible::NativeRole() const {
   // If other sectioning or sectioning root elements, they become sections.
   nsIContent* parent = mContent->GetParent();
   while (parent) {
-    if (parent->IsAnyOfHTMLElements(nsGkAtoms::article, nsGkAtoms::aside,
-                                    nsGkAtoms::nav, nsGkAtoms::section,
-                                    nsGkAtoms::blockquote, nsGkAtoms::details,
-                                    nsGkAtoms::dialog, nsGkAtoms::fieldset,
-                                    nsGkAtoms::figure, nsGkAtoms::td)) {
+    if (parent->IsAnyOfHTMLElements(
+            nsGkAtoms::article, nsGkAtoms::aside, nsGkAtoms::nav,
+            nsGkAtoms::section, nsGkAtoms::main, nsGkAtoms::blockquote,
+            nsGkAtoms::details, nsGkAtoms::dialog, nsGkAtoms::fieldset,
+            nsGkAtoms::figure, nsGkAtoms::td)) {
       break;
     }
     parent = parent->GetParent();
diff --git a/accessible/tests/mochitest/attributes/test_xml-roles.html b/accessible/tests/mochitest/attributes/test_xml-roles.html
index 29e3e7ce6685..77c0c18d6b11 100644
--- a/accessible/tests/mochitest/attributes/test_xml-roles.html
+++ b/accessible/tests/mochitest/attributes/test_xml-roles.html
@@ -21,9 +21,11 @@
       testAttrs("nav", {"xml-roles": "navigation"}, true);
       testAttrs("header", {"xml-roles": "banner"}, true);
       testAbsentAttrs("article_header", {"xml-roles": "banner"});
+      testAbsentAttrs("main_header", {"xml-roles": "banner"});
       testAbsentAttrs("section_header", {"xml-roles": "banner"});
       testAttrs("footer", {"xml-roles": "contentinfo"}, true);
       testAbsentAttrs("article_footer", {"xml-roles": "contentinfo"});
+      testAbsentAttrs("main_footer", {"xml-roles": "contentinfo"});
       testAbsentAttrs("section_footer", {"xml-roles": "contentinfo"});
       testAttrs("aside", {"xml-roles": "complementary"}, true);
       testAbsentAttrs("section", {"xml-roles": "region"}, true);
@@ -157,6 +159,10 @@
     <header id="article_header">a header within an article</header>
     <footer id="article_footer">a footer within an article</footer>
   </article>
+  <main id="main_with_header_and_footer">
+    <header id="main_header">a header within a main</header>
+    <footer id="main_footer">a footer within a main</footer>
+  </main>
   <section id="section_with_header_and_footer">
     <header id="section_header">a header within an section</header>
     <footer id="section_footer">a footer within an section</footer>
diff --git a/accessible/tests/mochitest/elm/test_HTMLSpec.html b/accessible/tests/mochitest/elm/test_HTMLSpec.html
index 4dcf4c5fcb78..397b0fc40490 100644
--- a/accessible/tests/mochitest/elm/test_HTMLSpec.html
+++ b/accessible/tests/mochitest/elm/test_HTMLSpec.html
@@ -526,6 +526,7 @@
       };
       testElm("footer_in_article", obj);
       testElm("footer_in_aside", obj);
+      testElm("footer_in_main", obj);
       testElm("footer_in_nav", obj);
       testElm("footer_in_section", obj);
       testElm("footer_in_blockquote", obj);
@@ -628,6 +629,7 @@
       };
       testElm("header_in_article", obj);
       testElm("header_in_aside", obj);
+      testElm("header_in_main", obj);
       testElm("header_in_nav", obj);
       testElm("header_in_section", obj);
       testElm("header_in_blockquote", obj);
@@ -1554,6 +1556,9 @@
   <aside>
     <footer id="footer_in_aside">Some copyright info</footer>
   </aside>
+  <main>
+    <footer id="footer_in_main">Some copyright info</footer>
+  </main>
   <nav>
     <footer id="footer_in_nav">Some copyright info</footer>
   </nav>
@@ -1600,6 +1605,9 @@
   <aside>
     <header id="header_in_aside">Not logo</header>
   </aside>
+  <main>
+    <header id="header_in_main">Not logo</header>
+  </main>
   <nav>
     <header id="header_in_nav">Not logo</header>
   </nav>
diff --git a/accessible/tests/mochitest/jsat/test_landmarks.html b/accessible/tests/mochitest/jsat/test_landmarks.html
index 09effcf58f90..04a86e59a80b 100644
--- a/accessible/tests/mochitest/jsat/test_landmarks.html
+++ b/accessible/tests/mochitest/jsat/test_landmarks.html
@@ -59,6 +59,21 @@
         expectedBraille: [
           ["a footer within an article"],
           ["a footer within an article"]],
+      }, {
+        accOrElmOrID: "main_header",
+        expectedUtterance: [["a header within main content"],
+                            ["a header within main content"]],
+        expectedBraille: [
+          ["a header within main content"],
+          ["a header within main content"]],
+      }, {
+        accOrElmOrID: "main_footer",
+        expectedUtterance: [
+          ["a footer within main content"],
+          ["a footer within main content"]],
+        expectedBraille: [
+          ["a footer within main content"],
+          ["a footer within main content"]],
       }, {
         accOrElmOrID: "section_header",
         expectedUtterance: [["a header within a section"],
@@ -159,6 +174,10 @@
       <header id="article_header">a header within an article</header>
       <footer id="article_footer">a footer within an article</footer>
     </article>
+    <main id="main_with_header_and_footer">
+      <header id="main_header">a header within main content</header>
+      <footer id="main_footer">a footer within main content</footer>
+    </main>
     <section id="section_with_header_and_footer">
       <header id="section_header">a header within a section</header>
       <footer id="section_footer">a footer within a section</footer>