diff options
15 files changed, 47 insertions, 10 deletions
diff --git a/chrome/common/extensions/api/automation.idl b/chrome/common/extensions/api/automation.idl index 2c48253..f6cfbce 100644 --- 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, diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc index e8acb01..9ab3dfa 100644 --- 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: diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index a43e5c3..d512d14 100644 --- 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")); diff --git a/content/renderer/accessibility/blink_ax_enum_conversion.cc b/content/renderer/accessibility/blink_ax_enum_conversion.cc index 5e75b99..02d73fd 100644 --- 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: diff --git a/content/renderer/accessibility/blink_ax_tree_source.cc b/content/renderer/accessibility/blink_ax_tree_source.cc index 06052c1..a930982 100644 --- 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: diff --git a/content/shell/renderer/test_runner/web_ax_object_proxy.cc b/content/shell/renderer/test_runner/web_ax_object_proxy.cc index ca7264f..cf04a57 100644 --- 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: diff --git a/content/test/data/accessibility/aria-math-expected-android.txt b/content/test/data/accessibility/aria-math-expected-android.txt new file mode 100644 index 0000000..5e75c36 --- /dev/null +++ b/content/test/data/accessibility/aria-math-expected-android.txt @@ -0,0 +1,2 @@ +android.webkit.WebView focusable focused scrollable + android.view.View clickable name='ARIA role math.' diff --git a/content/test/data/accessibility/aria-math-expected-mac.txt b/content/test/data/accessibility/aria-math-expected-mac.txt new file mode 100644 index 0000000..94949a6 --- /dev/null +++ b/content/test/data/accessibility/aria-math-expected-mac.txt @@ -0,0 +1,3 @@ +AXWebArea AXRoleDescription='HTML content' + AXGroup AXSubrole=AXDocumentMath AXRoleDescription='math' + AXStaticText AXRoleDescription='text' AXValue='ARIA role math.' diff --git a/content/test/data/accessibility/aria-math-expected-win.txt b/content/test/data/accessibility/aria-math-expected-win.txt new file mode 100644 index 0000000..3d0e2c7 --- /dev/null +++ b/content/test/data/accessibility/aria-math-expected-win.txt @@ -0,0 +1,3 @@ +ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE + ROLE_SYSTEM_EQUATION xml-roles:math + ROLE_SYSTEM_STATICTEXT name='ARIA role math.' diff --git a/content/test/data/accessibility/aria-math.html b/content/test/data/accessibility/aria-math.html new file mode 100644 index 0000000..38dc899 --- /dev/null +++ b/content/test/data/accessibility/aria-math.html @@ -0,0 +1,11 @@ +<!-- +@MAC-ALLOW:AXRole* +@MAC-ALLOW:AXSubrole* +@WIN-ALLOW:xml-roles* +--> +<!DOCTYPE html> +<html> +<body> + <div role="math">ARIA role math.</div> +</body> +</html> diff --git a/content/test/data/accessibility/math-expected-android.txt b/content/test/data/accessibility/math-expected-android.txt new file mode 100644 index 0000000..6ba9f81 --- /dev/null +++ b/content/test/data/accessibility/math-expected-android.txt @@ -0,0 +1 @@ +#<skip - blink side patch is required>
\ No newline at end of file diff --git a/content/test/data/accessibility/math-expected-mac.txt b/content/test/data/accessibility/math-expected-mac.txt new file mode 100644 index 0000000..6ba9f81 --- /dev/null +++ b/content/test/data/accessibility/math-expected-mac.txt @@ -0,0 +1 @@ +#<skip - blink side patch is required>
\ No newline at end of file diff --git a/content/test/data/accessibility/math-expected-win.txt b/content/test/data/accessibility/math-expected-win.txt new file mode 100644 index 0000000..6ba9f81 --- /dev/null +++ b/content/test/data/accessibility/math-expected-win.txt @@ -0,0 +1 @@ +#<skip - blink side patch is required>
\ No newline at end of file diff --git a/content/test/data/accessibility/math.html b/content/test/data/accessibility/math.html new file mode 100644 index 0000000..de3c57a --- /dev/null +++ b/content/test/data/accessibility/math.html @@ -0,0 +1,16 @@ +<!-- +@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> diff --git a/ui/accessibility/ax_enums.idl b/ui/accessibility/ax_enums.idl index 5add7a4..9f4e7e7 100644 --- 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, |