Skip to content
Permalink
Browse files
AX: [ATK] MathML tokens, tables, and row-like elements are exposed wi…
…th ATK_ROLE_UNKNOWN

https://bugs.webkit.org/show_bug.cgi?id=139402

Reviewed by Chris Fleizach.

Source/WebCore:

Expose tables and their children using existing table AtkRole types,
token elements using the new ATK_ROLE_STATIC, and row-like elements
using ATK_ROLE_PANEL. Also expose <mlabeledtr> as a math table row
and <ms> as math text.

No new tests; instead, added MathML elements to roles-exposed.html.

* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::isMathToken):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::isMathToken):
(WebCore::AccessibilityRenderObject::isMathText):
(WebCore::AccessibilityRenderObject::isMathTableRow):
* accessibility/AccessibilityRenderObject.h:
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):
* css/mathml.css:
(ms, mi, mo, mrow, mfenced, mfrac, msub, msup, msubsup, mmultiscripts, mprescripts, none, munder, mover, munderover, msqrt, mroot, merror, mphantom, mstyle, menclose):
(mi, mo, mrow, mfenced, mfrac, msub, msup, msubsup, mmultiscripts, mprescripts, none, munder, mover, munderover, msqrt, mroot, merror, mphantom, mstyle, menclose): Deleted.
* mathml/mathtags.in:

LayoutTests:

* accessibility/roles-exposed.html: Added MathML elements.
* platform/efl/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/gtk/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/mac-mountainlion/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/mac/accessibility/roles-exposed-expected.txt: Updated for added elements.


Canonical link: https://commits.webkit.org/157302@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177025 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
joanmarie committed Dec 9, 2014
1 parent e3b08e1 commit 2b285473f54ff3d0ca21de5d550530b4d58d5dce
Showing 14 changed files with 427 additions and 9 deletions.
@@ -1,3 +1,17 @@
2014-12-09 Joanmarie Diggs <jdiggs@igalia.com>

AX: [ATK] MathML tokens, tables, and row-like elements are exposed with ATK_ROLE_UNKNOWN
https://bugs.webkit.org/show_bug.cgi?id=139402

Reviewed by Chris Fleizach.

* accessibility/roles-exposed.html: Added MathML elements.
* platform/efl/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/gtk/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/mac-mountainlion/accessibility/roles-exposed-expected.txt: Updated for added elements.
* platform/mac/accessibility/roles-exposed-expected.txt: Updated for added elements.

2014-12-09 Joanmarie Diggs <jdiggs@igalia.com>

[GTK] Bump minimum version of ATK used by jhbuild to at least 2.15.2
@@ -96,7 +96,26 @@ <h6 data-platform="atk,mac" class="ex">X</h6>
<area data-platform="atk,mac" class="ex" shape="rect" coords="0,0,10,10" href="#" title="x" />
</map>
<!-- http://webkit.org/b/109018 --><mark data-platform="atk,mac" class="ex">X</mark>
<!-- Some MathML elements do not become hidden by display: none, so hide them after the test via a parent element. http://webkit.org/b/139403 --><div class="ex">
<math data-platform="atk,mac" class="ex">X</math>
<math><merror data-platform="atk,mac" class="ex">X</merror></math>
<math><mfenced data-platform="atk,mac" class="ex"><mi class="ex">X</mi></mfenced></math>
<math><mfrac data-platform="atk,mac" class="ex"><mi class="ex">X</mi><mn class="ex">Y</mn></mfrac></math>
<math><mi data-platform="atk,mac" class="ex">X</mi></math>
<math><mn data-platform="atk,mac" class="ex">X</mn></math>
<math><mo data-platform="atk,mac" class="ex">X</mo></math>
<math><mroot data-platform="atk,mac" class="ex">X</mroot></math>
<math><msqrt data-platform="atk,mac" class="ex">X</msqrt></math>
<math><mrow data-platform="atk,mac" class="ex"><mi class="ex">X</mi></mrow></math>
<math><ms data-platform="atk,mac" class="ex">X</ms></math>
<math><mtext data-platform="atk,mac" class="ex">X</mtext></math>
<math>
<mtable data-platform="atk,mac" class="ex">
<mlabeledtr data-platform="atk,mac" class="ex"><mtd data-platform="atk,mac" class="ex">X</mtd></mlabeledtr>
<mtr data-platform="atk,mac" class="ex"><mtd data-platform="atk,mac" class="ex">X</mtd></mtr>
</mtable>
</math>
</div>
<!-- skipped <menu> -->
<!-- skipped <meta> -->
<meter data-platform="atk,mac" class="ex" value="0.75">X</meter>
@@ -1,4 +1,4 @@
X
X
This tests that native elements and ARIA overrides result in the expected role, subrole and role description.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -220,6 +220,54 @@ mark
math
AXRole: AXMath

merror
AXRole: AXGroup

mfenced
AXRole: AXGroup

mfrac
AXRole: AXUnknown

mi
AXRole: AXUnknown

mn
AXRole: AXUnknown

mo
AXRole: AXUnknown

mroot
AXRole: AXUnknown

msqrt
AXRole: AXUnknown

mrow
AXRole: AXGroup

ms
AXRole: AXUnknown

mtext
AXRole: AXUnknown

mtable
AXRole: AXTable

mlabeledtr
AXRole: AXRow

mtd
AXRole: AXCell

mtr
AXRole: AXRow

mtd
AXRole: AXCell

meter
AXRole: AXProgressIndicator

@@ -1,4 +1,4 @@
X
X
This tests that native elements and ARIA overrides result in the expected role, subrole and role description.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -220,6 +220,54 @@ mark
math
AXRole: AXMath

merror
AXRole: AXGroup

mfenced
AXRole: AXGroup

mfrac
AXRole: AXUnknown

mi
AXRole: AXStatic

mn
AXRole: AXStatic

mo
AXRole: AXStatic

mroot
AXRole: AXUnknown

msqrt
AXRole: AXUnknown

mrow
AXRole: AXGroup

ms
AXRole: AXStatic

mtext
AXRole: AXStatic

mtable
AXRole: AXTable

mlabeledtr
AXRole: AXRow

mtd
AXRole: AXCell

mtr
AXRole: AXRow

mtd
AXRole: AXCell

meter
AXRole: AXProgressIndicator

@@ -1,4 +1,4 @@
X
X
This tests that native elements and ARIA overrides result in the expected role, subrole and role description.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -364,6 +364,86 @@ math
AXSubrole: AXDocumentMath
AXRoleDescription: math

merror
AXRole: AXGroup
AXSubrole: AXMathRow
AXRoleDescription: group

mfenced
AXRole: AXGroup
AXSubrole: AXMathFenced
AXRoleDescription: group

mfrac
AXRole: AXGroup
AXSubrole: AXMathFraction
AXRoleDescription: group

mi
AXRole: AXGroup
AXSubrole: AXMathIdentifier
AXRoleDescription: group

mn
AXRole: AXGroup
AXSubrole: AXMathNumber
AXRoleDescription: group

mo
AXRole: AXGroup
AXSubrole: AXMathOperator
AXRoleDescription: group

mroot
AXRole: AXGroup
AXSubrole: AXMathRoot
AXRoleDescription: group

msqrt
AXRole: AXGroup
AXSubrole: AXMathSquareRoot
AXRoleDescription: group

mrow
AXRole: AXGroup
AXSubrole: AXMathRow
AXRoleDescription: group

ms
AXRole: AXGroup
AXSubrole: AXMathText
AXRoleDescription: group

mtext
AXRole: AXGroup
AXSubrole: AXMathText
AXRoleDescription: group

mtable
AXRole: AXGroup
AXSubrole: AXMathTable
AXRoleDescription: group

mlabeledtr
AXRole: AXGroup
AXSubrole: AXMathTableRow
AXRoleDescription: group

mtd
AXRole: AXGroup
AXSubrole: AXMathTableCell
AXRoleDescription: group

mtr
AXRole: AXGroup
AXSubrole: AXMathTableRow
AXRoleDescription: group

mtd
AXRole: AXGroup
AXSubrole: AXMathTableCell
AXRoleDescription: group

meter
AXRole: AXProgressIndicator
AXSubrole:
@@ -1,4 +1,4 @@
X
X
This tests that native elements and ARIA overrides result in the expected role, subrole and role description.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -364,6 +364,86 @@ math
AXSubrole: AXDocumentMath
AXRoleDescription: math

merror
AXRole: AXGroup
AXSubrole: AXMathRow
AXRoleDescription: group

mfenced
AXRole: AXGroup
AXSubrole: AXMathFenced
AXRoleDescription: group

mfrac
AXRole: AXGroup
AXSubrole: AXMathFraction
AXRoleDescription: group

mi
AXRole: AXGroup
AXSubrole: AXMathIdentifier
AXRoleDescription: group

mn
AXRole: AXGroup
AXSubrole: AXMathNumber
AXRoleDescription: group

mo
AXRole: AXGroup
AXSubrole: AXMathOperator
AXRoleDescription: group

mroot
AXRole: AXGroup
AXSubrole: AXMathRoot
AXRoleDescription: group

msqrt
AXRole: AXGroup
AXSubrole: AXMathSquareRoot
AXRoleDescription: group

mrow
AXRole: AXGroup
AXSubrole: AXMathRow
AXRoleDescription: group

ms
AXRole: AXGroup
AXSubrole: AXMathText
AXRoleDescription: group

mtext
AXRole: AXGroup
AXSubrole: AXMathText
AXRoleDescription: group

mtable
AXRole: AXGroup
AXSubrole: AXMathTable
AXRoleDescription: group

mlabeledtr
AXRole: AXGroup
AXSubrole: AXMathTableRow
AXRoleDescription: group

mtd
AXRole: AXGroup
AXSubrole: AXMathTableCell
AXRoleDescription: group

mtr
AXRole: AXGroup
AXSubrole: AXMathTableRow
AXRoleDescription: group

mtd
AXRole: AXGroup
AXSubrole: AXMathTableCell
AXRoleDescription: group

meter
AXRole: AXProgressIndicator
AXSubrole:

0 comments on commit 2b28547

Please sign in to comment.