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 1177640 - [Mac] Do not expose HTML table semantics for "layout" tables. r=surkov

Browse Source
This commit is contained in:
Frédéric Wang 2015-09-30 17:49:00 +02:00
parent 34e4d2e8a9
commit 222fdec0be
1 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
accessible/mac/mozAccessible.mm
View File

@ -224,6 +224,42 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
}
- (BOOL)isLayoutTablePart
{
if (AccessibleWrap* accWrap = [self getGeckoAccessible]) {
TableAccessible* table = nullptr;
if (accWrap->IsTable()) {
table = accWrap->AsTable();
} else if (accWrap->IsTableRow()) {
for (Accessible* acc = accWrap; acc; acc = acc->Parent()) {
if (acc->IsTable()) {
table = acc->AsTable();
break;
}
}
} else if (accWrap->IsTableCell()) {
table = accWrap->AsTableCell()->Table();
}
return table && table->IsProbablyLayoutTable();
}
if (ProxyAccessible* proxy = [self getProxyAccessible]) {
ProxyAccessible* tableProxy = nullptr;
if (proxy->IsTable()) {
tableProxy = proxy;
} else if (proxy->IsTableRow() || proxy->IsTableCell()) {
for (tableProxy = proxy; tableProxy; tableProxy = tableProxy->Parent()) {
if (tableProxy->IsTable()) {
break;
}
}
}
return tableProxy && tableProxy->TableIsProbablyForLayout();
}
return false;
}
- (NSArray*)additionalAccessibilityAttributeNames
{
NSMutableArray* additional = [NSMutableArray array];
@ -334,12 +370,14 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
NSArray* objectAttributes = generalAttributes;
if ((accWrap && accWrap->IsTable()) || (proxy && proxy->IsTable()))
objectAttributes = tableAttrs;
else if ((accWrap && accWrap->IsTableRow()) || (proxy && proxy->IsTableRow()))
objectAttributes = tableRowAttrs;
else if ((accWrap && accWrap->IsTableCell()) || (proxy && proxy->IsTableCell()))
objectAttributes = tableCellAttrs;
if (![self isLayoutTablePart]) {
if ((accWrap && accWrap->IsTable()) || (proxy && proxy->IsTable()))
objectAttributes = tableAttrs;
else if ((accWrap && accWrap->IsTableRow()) || (proxy && proxy->IsTableRow()))
objectAttributes = tableRowAttrs;
else if ((accWrap && accWrap->IsTableCell()) || (proxy && proxy->IsTableCell()))
objectAttributes = tableCellAttrs;
}
NSArray* additionalAttributes = [self additionalAccessibilityAttributeNames];
if ([additionalAttributes count])
@ -904,6 +942,10 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
return nil;
}
if ([self isLayoutTablePart]) {
return NSAccessibilityGroupRole;
}
#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \
case roles::geckoRole: \
return macRole;