ARIA role math and HTML math element are not exposed correctly.

MSAA+IA2 ROLE_SYSTEM_EQUATION AX: AXGroup AXDocumentMath 'math' Expectations for math.html is skipped in this patch, since it need a blink side patch too. BUG=429476 Review URL: https://codereview.chromium.org/695133002 Cr-Commit-Position: refs/heads/master@{#302610}

ARIA role math and HTML math element are not exposed correctly.
MSAA+IA2 ROLE_SYSTEM_EQUATION AX: AXGroup AXDocumentMath 'math' Expectations for math.html is skipped in this patch, since it need a blink side patch too. BUG=429476 Review URL: https://codereview.chromium.org/695133002 Cr-Commit-Position: refs/heads/master@{#302610}
277545d2 · shreeram.k · Commit bot · 0a3f60fa · 277545d2 · 277545d2
Commit 277545d2 authored Nov 04, 2014 by shreeram.k Committed by Commit bot Nov 04, 2014
15 changed files
--- a/chrome/common/extensions/api/automation.idl
+++ b/chrome/common/extensions/api/automation.idl
@@ -117,7 +117,6 @@
    log,
    main,
    marquee,
-    mathElement,
    math,
    matte,
    menuBar,

--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3620,9 +3620,8 @@ void BrowserAccessibilityWin::InitRoleAndState() {
    case ui::AX_ROLE_MARQUEE:
      ia_role_ = ROLE_SYSTEM_ANIMATION;
      break;
-    case ui::AX_ROLE_MATH_ELEMENT:
+    case ui::AX_ROLE_MATH:
      ia_role_ = ROLE_SYSTEM_EQUATION;
-      ia_state_ |= STATE_SYSTEM_READONLY;
      break;
    case ui::AX_ROLE_MENU:
    case ui::AX_ROLE_MENU_BUTTON:

--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -487,6 +487,10 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
  RunTest(FILE_PATH_LITERAL("aria-orientation.html"));
 }
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaMath) {
+  RunTest(FILE_PATH_LITERAL("aria-math.html"));
+}
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaNone) {
  RunTest(FILE_PATH_LITERAL("aria-none.html"));
 }
@@ -878,6 +882,10 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMark) {
  RunTest(FILE_PATH_LITERAL("mark.html"));
 }
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityMath) {
+  RunTest(FILE_PATH_LITERAL("math.html"));
+}
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
                       AccessibilityMenutypecontext) {
  RunTest(FILE_PATH_LITERAL("menu-type-context.html"));

--- a/content/renderer/accessibility/blink_ax_enum_conversion.cc
+++ b/content/renderer/accessibility/blink_ax_enum_conversion.cc
@@ -210,8 +210,6 @@ ui::AXRole AXRoleFromBlink(blink::WebAXRole role) {
      return ui::AX_ROLE_MARQUEE;
    case blink::WebAXRoleMath:
      return ui::AX_ROLE_MATH;
-    case blink::WebAXRoleMathElement:
-      return ui::AX_ROLE_MATH_ELEMENT;
    case blink::WebAXRoleMatte:
      return ui::AX_ROLE_MATTE;
    case blink::WebAXRoleMenu:

--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -78,8 +78,6 @@ std::string GetEquivalentAriaRoleString(const ui::AXRole role) {
      return "img";
    case ui::AX_ROLE_MAIN:
      return "main";
-    case ui::AX_ROLE_MATH_ELEMENT:
-      return "math";
    case ui::AX_ROLE_NAVIGATION:
      return "navigation";
    case ui::AX_ROLE_RADIO_BUTTON:

--- a/content/shell/renderer/test_runner/web_ax_object_proxy.cc
+++ b/content/shell/renderer/test_runner/web_ax_object_proxy.cc
@@ -142,8 +142,6 @@ std::string RoleToString(blink::WebAXRole role)
      return result.append("Main");
    case blink::WebAXRoleMarquee:
      return result.append("Marquee");
-    case blink::WebAXRoleMathElement:
-      return result.append("MathElement");
    case blink::WebAXRoleMath:
      return result.append("Math");
    case blink::WebAXRoleMatte:

--- a/content/test/data/accessibility/aria-math-expected-android.txt
+++ b/content/test/data/accessibility/aria-math-expected-android.txt
+android.webkit.WebView focusable focused scrollable
+    android.view.View clickable name='ARIA role math.'
--- a/content/test/data/accessibility/aria-math-expected-mac.txt
+++ b/content/test/data/accessibility/aria-math-expected-mac.txt
+AXWebArea AXRoleDescription='HTML content'
+    AXGroup AXSubrole=AXDocumentMath AXRoleDescription='math'
+        AXStaticText AXRoleDescription='text' AXValue='ARIA role math.'
--- a/content/test/data/accessibility/aria-math-expected-win.txt
+++ b/content/test/data/accessibility/aria-math-expected-win.txt
+ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
+    ROLE_SYSTEM_EQUATION xml-roles:math
+        ROLE_SYSTEM_STATICTEXT name='ARIA role math.'
--- a/content/test/data/accessibility/aria-math.html
+++ b/content/test/data/accessibility/aria-math.html
+<!--
+@MAC-ALLOW:AXRole*
+@MAC-ALLOW:AXSubrole*
+@WIN-ALLOW:xml-roles*
+-->
+<!DOCTYPE html>
+<html>
+<body>
+  <div role="math">ARIA role math.</div>
+</body>
+</html>
--- a/content/test/data/accessibility/math-expected-android.txt
+++ b/content/test/data/accessibility/math-expected-android.txt
+#<skip - blink side patch is required>
\ No newline at end of file
--- a/content/test/data/accessibility/math-expected-mac.txt
+++ b/content/test/data/accessibility/math-expected-mac.txt
+#<skip - blink side patch is required>
\ No newline at end of file
--- a/content/test/data/accessibility/math-expected-win.txt
+++ b/content/test/data/accessibility/math-expected-win.txt
+#<skip - blink side patch is required>
\ No newline at end of file
--- a/content/test/data/accessibility/math.html
+++ b/content/test/data/accessibility/math.html
+<!--
+@MAC-ALLOW:AXRole*
+@MAC-ALLOW:AXSubrole*
+-->
+<!DOCTYPE html>
+<html>
+<body>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <mrow>
+      <msup><mi>a</mi><mn>2</mn></msup>
+      <mo>+</mo>
+      <msup><mi>b</mi><mn>2</mn></msup>
+    </mrow>
+ </math>
+</body>
+</html>
--- a/ui/accessibility/ax_enums.idl
+++ b/ui/accessibility/ax_enums.idl
@@ -126,7 +126,6 @@
    log,
    main,
    marquee,
-    math_element,
    math,
    matte,
    menu_bar,