wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1175269 - Add MathML roles/subroles for NSAccessibility. r=surkov

Browse Source
This commit is contained in:
Frédéric Wang 2015-06-19 15:55:00 +02:00
parent 4e9a1d132e
commit ef52011bc4
2 changed files with 94 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
accessible/base/RoleMap.h
View File

@ -1067,7 +1067,7 @@ ROLE(SWITCH,
ROLE(MATHML_MATH, ROLE(MATHML_MATH,
"math", "math",
ATK_ROLE_MATH, ATK_ROLE_MATH,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
ROLE_SYSTEM_EQUATION, ROLE_SYSTEM_EQUATION,
ROLE_SYSTEM_EQUATION, ROLE_SYSTEM_EQUATION,
eNoNameRule) eNoNameRule)
@ -1075,7 +1075,7 @@ ROLE(MATHML_MATH,
ROLE(MATHML_IDENTIFIER, ROLE(MATHML_IDENTIFIER,
"mathml identifier", "mathml identifier",
ATK_ROLE_STATIC, ATK_ROLE_STATIC,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNameFromSubtreeRule) eNameFromSubtreeRule)
@ -1083,7 +1083,7 @@ ROLE(MATHML_IDENTIFIER,
ROLE(MATHML_NUMBER, ROLE(MATHML_NUMBER,
"mathml number", "mathml number",
ATK_ROLE_STATIC, ATK_ROLE_STATIC,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNameFromSubtreeRule) eNameFromSubtreeRule)
@ -1091,7 +1091,7 @@ ROLE(MATHML_NUMBER,
ROLE(MATHML_OPERATOR, ROLE(MATHML_OPERATOR,
"mathml operator", "mathml operator",
ATK_ROLE_STATIC, ATK_ROLE_STATIC,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNameFromSubtreeRule) eNameFromSubtreeRule)
@ -1099,7 +1099,7 @@ ROLE(MATHML_OPERATOR,
ROLE(MATHML_TEXT, ROLE(MATHML_TEXT,
"mathml text", "mathml text",
ATK_ROLE_STATIC, ATK_ROLE_STATIC,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNameFromSubtreeRule) eNameFromSubtreeRule)
@ -1107,7 +1107,7 @@ ROLE(MATHML_TEXT,
ROLE(MATHML_STRING_LITERAL, ROLE(MATHML_STRING_LITERAL,
"mathml string literal", "mathml string literal",
ATK_ROLE_STATIC, ATK_ROLE_STATIC,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNameFromSubtreeRule) eNameFromSubtreeRule)
@ -1115,7 +1115,7 @@ ROLE(MATHML_STRING_LITERAL,
ROLE(MATHML_GLYPH, ROLE(MATHML_GLYPH,
"mathml glyph", "mathml glyph",
ATK_ROLE_IMAGE, ATK_ROLE_IMAGE,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNameFromSubtreeRule) eNameFromSubtreeRule)
@ -1123,7 +1123,7 @@ ROLE(MATHML_GLYPH,
ROLE(MATHML_ROW, ROLE(MATHML_ROW,
"mathml row", "mathml row",
ATK_ROLE_PANEL, ATK_ROLE_PANEL,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1131,7 +1131,7 @@ ROLE(MATHML_ROW,
ROLE(MATHML_FRACTION, ROLE(MATHML_FRACTION,
"mathml fraction", "mathml fraction",
ATK_ROLE_MATH_FRACTION, ATK_ROLE_MATH_FRACTION,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1139,7 +1139,7 @@ ROLE(MATHML_FRACTION,
ROLE(MATHML_SQUARE_ROOT, ROLE(MATHML_SQUARE_ROOT,
"mathml square root", "mathml square root",
ATK_ROLE_MATH_ROOT, ATK_ROLE_MATH_ROOT,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1147,7 +1147,7 @@ ROLE(MATHML_SQUARE_ROOT,
ROLE(MATHML_ROOT, ROLE(MATHML_ROOT,
"mathml root", "mathml root",
ATK_ROLE_MATH_ROOT, ATK_ROLE_MATH_ROOT,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1155,7 +1155,7 @@ ROLE(MATHML_ROOT,
ROLE(MATHML_FENCED, ROLE(MATHML_FENCED,
"mathml fenced", "mathml fenced",
ATK_ROLE_PANEL, ATK_ROLE_PANEL,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1163,7 +1163,7 @@ ROLE(MATHML_FENCED,
ROLE(MATHML_ENCLOSED, ROLE(MATHML_ENCLOSED,
"mathml enclosed", "mathml enclosed",
ATK_ROLE_PANEL, ATK_ROLE_PANEL,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1171,7 +1171,7 @@ ROLE(MATHML_ENCLOSED,
ROLE(MATHML_STYLE, ROLE(MATHML_STYLE,
"mathml style", "mathml style",
ATK_ROLE_PANEL, ATK_ROLE_PANEL,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1179,7 +1179,7 @@ ROLE(MATHML_STYLE,
ROLE(MATHML_SUB, ROLE(MATHML_SUB,
"mathml sub", "mathml sub",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1187,7 +1187,7 @@ ROLE(MATHML_SUB,
ROLE(MATHML_SUP, ROLE(MATHML_SUP,
"mathml sup", "mathml sup",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1195,7 +1195,7 @@ ROLE(MATHML_SUP,
ROLE(MATHML_SUB_SUP, ROLE(MATHML_SUB_SUP,
"mathml sub sup", "mathml sub sup",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1203,7 +1203,7 @@ ROLE(MATHML_SUB_SUP,
ROLE(MATHML_UNDER, ROLE(MATHML_UNDER,
"mathml under", "mathml under",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1211,7 +1211,7 @@ ROLE(MATHML_UNDER,
ROLE(MATHML_OVER, ROLE(MATHML_OVER,
"mathml over", "mathml over",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1219,7 +1219,7 @@ ROLE(MATHML_OVER,
ROLE(MATHML_UNDER_OVER, ROLE(MATHML_UNDER_OVER,
"mathml under over", "mathml under over",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1227,7 +1227,7 @@ ROLE(MATHML_UNDER_OVER,
ROLE(MATHML_MULTISCRIPTS, ROLE(MATHML_MULTISCRIPTS,
"mathml multiscripts", "mathml multiscripts",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1235,7 +1235,7 @@ ROLE(MATHML_MULTISCRIPTS,
ROLE(MATHML_TABLE, ROLE(MATHML_TABLE,
"mathml table", "mathml table",
ATK_ROLE_TABLE, ATK_ROLE_TABLE,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1243,7 +1243,7 @@ ROLE(MATHML_TABLE,
ROLE(MATHML_LABELED_ROW, ROLE(MATHML_LABELED_ROW,
"mathml labeled row", "mathml labeled row",
ATK_ROLE_TABLE_ROW, ATK_ROLE_TABLE_ROW,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1251,7 +1251,7 @@ ROLE(MATHML_LABELED_ROW,
ROLE(MATHML_TABLE_ROW, ROLE(MATHML_TABLE_ROW,
"mathml table row", "mathml table row",
ATK_ROLE_TABLE_ROW, ATK_ROLE_TABLE_ROW,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1259,7 +1259,7 @@ ROLE(MATHML_TABLE_ROW,
ROLE(MATHML_CELL, ROLE(MATHML_CELL,
"mathml cell", "mathml cell",
ATK_ROLE_TABLE_CELL, ATK_ROLE_TABLE_CELL,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1267,7 +1267,7 @@ ROLE(MATHML_CELL,
ROLE(MATHML_ACTION, ROLE(MATHML_ACTION,
"mathml action", "mathml action",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1275,7 +1275,7 @@ ROLE(MATHML_ACTION,
ROLE(MATHML_ERROR, ROLE(MATHML_ERROR,
"mathml error", "mathml error",
ATK_ROLE_PANEL, ATK_ROLE_PANEL,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1283,7 +1283,7 @@ ROLE(MATHML_ERROR,
ROLE(MATHML_STACK, ROLE(MATHML_STACK,
"mathml stack", "mathml stack",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1291,7 +1291,7 @@ ROLE(MATHML_STACK,
ROLE(MATHML_LONG_DIVISION, ROLE(MATHML_LONG_DIVISION,
"mathml long division", "mathml long division",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1299,7 +1299,7 @@ ROLE(MATHML_LONG_DIVISION,
ROLE(MATHML_STACK_GROUP, ROLE(MATHML_STACK_GROUP,
"mathml stack group", "mathml stack group",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1307,7 +1307,7 @@ ROLE(MATHML_STACK_GROUP,
ROLE(MATHML_STACK_ROW, ROLE(MATHML_STACK_ROW,
"mathml stack row", "mathml stack row",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1315,7 +1315,7 @@ ROLE(MATHML_STACK_ROW,
ROLE(MATHML_STACK_CARRIES, ROLE(MATHML_STACK_CARRIES,
"mathml stack carries", "mathml stack carries",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1323,7 +1323,7 @@ ROLE(MATHML_STACK_CARRIES,
ROLE(MATHML_STACK_CARRY, ROLE(MATHML_STACK_CARRY,
"mathml stack carry", "mathml stack carry",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)
@ -1331,7 +1331,7 @@ ROLE(MATHML_STACK_CARRY,
ROLE(MATHML_STACK_LINE, ROLE(MATHML_STACK_LINE,
"mathml stack line", "mathml stack line",
ATK_ROLE_UNKNOWN, ATK_ROLE_UNKNOWN,
NSAccessibilityUnknownRole, NSAccessibilityGroupRole,
0, 0,
IA2_ROLE_UNKNOWN, IA2_ROLE_UNKNOWN,
eNoNameRule) eNoNameRule)

60
accessible/mac/mozAccessible.mm
View File

@ -503,6 +503,66 @@ GetClosestInterestingAccessible(id anObject)
case roles::DEFINITION: case roles::DEFINITION:
return @"AXDefinition"; return @"AXDefinition";
case roles::MATHML_MATH:
return @"AXDocumentMath";
case roles::MATHML_FRACTION:
return @"AXMathFraction";
case roles::MATHML_FENCED:
// XXX This should be AXMathFence, but doing so without implementing the
// whole fence interface seems to make VoiceOver crash, so we present it
// as a row for now.
return @"AXMathRow";
case roles::MATHML_SUB:
case roles::MATHML_SUP:
case roles::MATHML_SUB_SUP:
return @"AXMathSubscriptSuperscript";
case roles::MATHML_ROW:
return @"AXMathRow";
case roles::MATHML_UNDER:
case roles::MATHML_OVER:
case roles::MATHML_UNDER_OVER:
return @"AXMathUnderOver";
case roles::MATHML_SQUARE_ROOT:
return @"AXMathSquareRoot";
case roles::MATHML_ROOT:
return @"AXMathRoot";
case roles::MATHML_TEXT:
return @"AXMathText";
case roles::MATHML_NUMBER:
return @"AXMathNumber";
case roles::MATHML_IDENTIFIER:
return @"AXMathIdentifier";
case roles::MATHML_TABLE:
return @"AXMathTable";
case roles::MATHML_TABLE_ROW:
return @"AXMathTableRow";
case roles::MATHML_CELL:
return @"AXMathTableCell";
// XXX: NSAccessibility also uses subroles AXMathSeparatorOperator and
// AXMathFenceOperator. We should use the NS_MATHML_OPERATOR_FENCE and
// NS_MATHML_OPERATOR_SEPARATOR bits of nsOperatorFlags, but currently they
// are only available from the MathML layout code. Hence we just fallback
// to subrole AXMathOperator for now.
case roles::MATHML_OPERATOR:
return @"AXMathOperator";
case roles::MATHML_MULTISCRIPTS:
return @"AXMathMultiscript";
case roles::SWITCH: case roles::SWITCH:
return @"AXSwitch"; return @"AXSwitch";