Html main tag is not exposed with correct IA2 ROLE

main tag or aria role main is not exposed with correct IA2 role. The correct IA2 role for main is ROLE_SYSTEM_GROUPING BUG=417654 Review URL: https://codereview.chromium.org/601173002 Cr-Commit-Position: refs/heads/master@{#296896}

Html main tag is not exposed with correct IA2 ROLE
main tag or aria role main is not exposed with correct IA2 role. The correct IA2 role for main is ROLE_SYSTEM_GROUPING BUG=417654 Review URL: https://codereview.chromium.org/601173002 Cr-Commit-Position: refs/heads/master@{#296896}
4b91c2d8 · shreeram.k · Commit bot · d0df0181 · 4b91c2d8 · 4b91c2d8
Commit 4b91c2d8 authored Sep 25, 2014 by shreeram.k Committed by Commit bot Sep 26, 2014
7 changed files
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3549,10 +3549,12 @@ void BrowserAccessibilityWin::InitRoleAndState() {
      ia_role_ = ROLE_SYSTEM_TEXT;
      ia2_role_ = IA2_ROLE_LABEL;
      break;
+    case ui::AX_ROLE_MAIN:
+      ia_role_ = ROLE_SYSTEM_GROUPING;
+      break;
    case ui::AX_ROLE_BANNER:
    case ui::AX_ROLE_COMPLEMENTARY:
    case ui::AX_ROLE_CONTENT_INFO:
-    case ui::AX_ROLE_MAIN:
    case ui::AX_ROLE_NAVIGATION:
    case ui::AX_ROLE_SEARCH:
      ia_role_ = ROLE_SYSTEM_GROUPING;

--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -635,6 +635,10 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityListMarkers) {
  RunTest(FILE_PATH_LITERAL("list-markers.html"));
 }

+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMain) {
+  RunTest(FILE_PATH_LITERAL("main.html"));
+}
+
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMark) {
  RunTest(FILE_PATH_LITERAL("mark.html"));
 }

--- a/content/test/data/accessibility/landmark-expected-win.txt
+++ b/content/test/data/accessibility/landmark-expected-win.txt
@@ -7,7 +7,7 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
        ROLE_SYSTEM_STATICTEXT name='This is an address element.'
    IA2_ROLE_FOOTER READONLY xml-roles:contentinfo
        ROLE_SYSTEM_STATICTEXT name='This is a footer element.'
-    IA2_ROLE_SECTION READONLY xml-roles:main
+    ROLE_SYSTEM_GROUPING xml-roles:main
        ROLE_SYSTEM_STATICTEXT name='This is a main element.'
    IA2_ROLE_SECTION READONLY xml-roles:navigation
        ROLE_SYSTEM_STATICTEXT name='This is a nav element.'
@@ -19,7 +19,7 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
        ROLE_SYSTEM_STATICTEXT name='This is an ARIA complementary landmark.'
    IA2_ROLE_SECTION READONLY xml-roles:contentinfo
        ROLE_SYSTEM_STATICTEXT name='This is an ARIA contentinfo landmark.'
-    IA2_ROLE_SECTION READONLY xml-roles:main
+    ROLE_SYSTEM_GROUPING xml-roles:main
        ROLE_SYSTEM_STATICTEXT name='This is an ARIA main landmark.'
    IA2_ROLE_SECTION READONLY xml-roles:navigation
        ROLE_SYSTEM_STATICTEXT name='This is an ARIA navigation landmark.'

--- a/content/test/data/accessibility/main-expected-android.txt
+++ b/content/test/data/accessibility/main-expected-android.txt
+android.webkit.WebView focusable focused scrollable
+    android.view.View clickable name='This is main element.'
+    android.view.View clickable name='This is an ARIA role main.'
--- a/content/test/data/accessibility/main-expected-mac.txt
+++ b/content/test/data/accessibility/main-expected-mac.txt
+AXWebArea AXRoleDescription='HTML content'
+    AXGroup AXSubrole=AXLandmarkMain AXRoleDescription='group'
+        AXStaticText AXRoleDescription='text' AXValue='This is main element.'
+    AXGroup AXSubrole=AXLandmarkMain AXRoleDescription='main'
+        AXStaticText AXRoleDescription='text' AXValue='This is an ARIA role main.'
--- a/content/test/data/accessibility/main-expected-win.txt
+++ b/content/test/data/accessibility/main-expected-win.txt
+ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
+    ROLE_SYSTEM_GROUPING xml-roles:main
+        ROLE_SYSTEM_STATICTEXT name='This is main element.'
+    ROLE_SYSTEM_GROUPING xml-roles:main
+        ROLE_SYSTEM_STATICTEXT name='This is an ARIA role main.'
--- a/content/test/data/accessibility/main.html
+++ b/content/test/data/accessibility/main.html
+<!--
+@MAC-ALLOW:AXRole=*
+@MAC-ALLOW:AXSubrole=*
+@MAC-ALLOW:AXRoleDescription=*
+@WIN-ALLOW:xml-roles:*
+-->
+<!DOCTYPE html>
+<html>
+<body>
+  <main>
+    This is main element.
+  </main>
+
+  <div role="main">
+    This is an ARIA role main.
+  </div>
+</body>
+</html>