Adds conversion rule for WebAXRoleNone

This is blink side patch for this CL https://codereview.chromium.org/588653003/ BUG=385070 Review URL: https://codereview.chromium.org/592683002 Cr-Commit-Position: refs/heads/master@{#296521}

Adds conversion rule for WebAXRoleNone
This is blink side patch for this CL https://codereview.chromium.org/588653003/ BUG=385070 Review URL: https://codereview.chromium.org/592683002 Cr-Commit-Position: refs/heads/master@{#296521}
7169b5a9 · shreeram.k · Commit bot · 978a4bf4 · 7169b5a9 · 7169b5a9
Commit 7169b5a9 authored Sep 24, 2014 by shreeram.k Committed by Commit bot Sep 24, 2014
9 changed files
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3773,6 +3773,7 @@ void BrowserAccessibilityWin::InitRoleAndState() {
    case ui::AX_ROLE_LOG:
    case ui::AX_ROLE_MARQUEE:
    case ui::AX_ROLE_MATTE:
+    case ui::AX_ROLE_NONE:
    case ui::AX_ROLE_PRESENTATIONAL:
    case ui::AX_ROLE_RULER_MARKER:
    case ui::AX_ROLE_SHEET:

--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -406,6 +406,10 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
  RunTest(FILE_PATH_LITERAL("aria-orientation.html"));
 }
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaNone) {
+  RunTest(FILE_PATH_LITERAL("aria-none.html"));
+}
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                       AccessibilityAriaPressed) {
  RunTest(FILE_PATH_LITERAL("aria-pressed.html"));

--- a/content/renderer/accessibility/blink_ax_enum_conversion.cc
+++ b/content/renderer/accessibility/blink_ax_enum_conversion.cc
@@ -216,6 +216,8 @@ ui::AXRole AXRoleFromBlink(blink::WebAXRole role) {
      return ui::AX_ROLE_MENU_LIST_POPUP;
    case blink::WebAXRoleNavigation:
      return ui::AX_ROLE_NAVIGATION;
+    case blink::WebAXRoleNone:
+      return ui::AX_ROLE_NONE;
    case blink::WebAXRoleNote:
      return ui::AX_ROLE_NOTE;
    case blink::WebAXRoleOutline:

--- a/content/shell/renderer/test_runner/web_ax_object_proxy.cc
+++ b/content/shell/renderer/test_runner/web_ax_object_proxy.cc
@@ -148,6 +148,8 @@ std::string RoleToString(blink::WebAXRole role)
      return result.append("Menu");
    case blink::WebAXRoleNavigation:
      return result.append("Navigation");
+    case blink::WebAXRoleNone:
+      return result.append("None");
    case blink::WebAXRoleNote:
      return result.append("Note");
    case blink::WebAXRoleOutline:

--- a/content/test/data/accessibility/aria-none-expected-android.txt
+++ b/content/test/data/accessibility/aria-none-expected-android.txt
+android.webkit.WebView focusable focused scrollable name='With aria-role none'
+    android.view.View clickable name='With aria-role none'
--- a/content/test/data/accessibility/aria-none-expected-mac.txt
+++ b/content/test/data/accessibility/aria-none-expected-mac.txt
+AXWebArea
+    AXStaticText AXValue='With aria-role none'
--- a/content/test/data/accessibility/aria-none-expected-win.txt
+++ b/content/test/data/accessibility/aria-none-expected-win.txt
+ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
+    ROLE_SYSTEM_STATICTEXT name='With aria-role none'
--- a/content/test/data/accessibility/aria-none.html
+++ b/content/test/data/accessibility/aria-none.html
+<!DOCTYPE html>
+<html>
+<body>
+<h1 role="none"> With aria-role none </h1>
+</body>
+</html>
--- a/ui/accessibility/platform/ax_platform_node_mac.mm
+++ b/ui/accessibility/platform/ax_platform_node_mac.mm
@@ -84,6 +84,7 @@ RoleMap BuildRoleMap() {
      {ui::AX_ROLE_MENU_LIST_OPTION, NSAccessibilityMenuItemRole},
      {ui::AX_ROLE_MENU_LIST_POPUP, NSAccessibilityUnknownRole},
      {ui::AX_ROLE_NAVIGATION, NSAccessibilityGroupRole},
+      {ui::AX_ROLE_NONE, NSAccessibilityGroupRole},
      {ui::AX_ROLE_NOTE, NSAccessibilityGroupRole},
      {ui::AX_ROLE_OUTLINE, NSAccessibilityOutlineRole},
      {ui::AX_ROLE_PARAGRAPH, NSAccessibilityGroupRole},