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 812055 - provide better naming for ETextEquivRule constants, r=surkov

Browse Source
This commit is contained in:
Hao Gao 2012-11-15 19:58:05 +09:00
parent e07ca9b6b2
commit 80c84b32c6
3 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
accessible/src/base/RoleMap.h
View File

File diff suppressed because it is too large Load Diff

6
accessible/src/base/nsTextEquivUtils.cpp
View File

@ -32,7 +32,7 @@ nsTextEquivUtils::GetNameFromSubtree(Accessible* aAccessible,
return NS_OK;
gInitiatorAcc = aAccessible;
if (GetRoleRule(aAccessible->Role()) == eFromSubtree) {
if (GetRoleRule(aAccessible->Role()) == eNameFromSubtreeRule) {
//XXX: is it necessary to care the accessible is not a document?
if (aAccessible->IsContent()) {
nsAutoString name;
@ -213,7 +213,7 @@ nsTextEquivUtils::AppendFromAccessible(Accessible* aAccessible,
// it's not root and not control.
if (isEmptyTextEquiv) {
uint32_t nameRule = GetRoleRule(aAccessible->Role());
if (nameRule & eFromSubtreeIfRec) {
if (nameRule & eNameFromSubtreeIfReqRule) {
rv = AppendFromAccessibleChildren(aAccessible, aString);
NS_ENSURE_SUCCESS(rv, rv);
@ -235,7 +235,7 @@ nsresult
nsTextEquivUtils::AppendFromValue(Accessible* aAccessible,
nsAString *aString)
{
if (GetRoleRule(aAccessible->Role()) != eFromValue)
if (GetRoleRule(aAccessible->Role()) != eNameFromValueRule)
return NS_OK_NO_NAME_CLAUSE_HANDLED;
// Implementation of step f. of text equivalent computation. If the given

8
accessible/src/base/nsTextEquivUtils.h
View File

@ -20,19 +20,19 @@
enum ETextEquivRule
{
// No rule.
eNoRule = 0x00,
eNoNameRule = 0x00,
// Walk into subtree only if the currently navigated accessible is not root
// accessible (i.e. if the accessible is part of text equivalent computation).
eFromSubtreeIfRec = 0x01,
eNameFromSubtreeIfReqRule = 0x01,
// Text equivalent computation from subtree is allowed.
eFromSubtree = 0x03,
eNameFromSubtreeRule = 0x03,
// The accessible allows to append its value to text equivalent.
// XXX: This is temporary solution. Once we move accessible value of links
// and linkable accessibles to MSAA part we can remove this.
eFromValue = 0x04
eNameFromValueRule = 0x04
};
/**