bug 1241453 - clean up GetAccessibleWrap() r=davidb

We can simplify it some to make better use of AccessibleOrProxy.
This commit is contained in:
Trevor Saunders 2016-01-19 07:40:42 -05:00
parent 2e7c424cea
commit 6db1192c25

View File

@ -1064,13 +1064,13 @@ GetAccessibleWrap(AtkObject* aAtkObj)
NS_ENSURE_TRUE(isMAIObject || MAI_IS_ATK_SOCKET(aAtkObj),
nullptr);
uintptr_t accWrapPtr = isMAIObject ?
MAI_ATK_OBJECT(aAtkObj)->accWrap.Bits() :
reinterpret_cast<uintptr_t>(MAI_ATK_SOCKET(aAtkObj)->accWrap);
if (accWrapPtr & IS_PROXY)
return nullptr;
AccessibleWrap* accWrap = reinterpret_cast<AccessibleWrap*>(accWrapPtr);
AccessibleWrap* accWrap = nullptr;
if (isMAIObject) {
Accessible* acc = MAI_ATK_OBJECT(aAtkObj)->accWrap.AsAccessible();
accWrap = static_cast<AccessibleWrap*>(acc);
} else {
accWrap = MAI_ATK_SOCKET(aAtkObj)->accWrap;
}
// Check if the accessible was deconstructed.
if (!accWrap)