Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 19:38:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1688490: Make GetNativeFromGeckoAccessible null-safe r=eeejay

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D103813
This commit is contained in:
Morgan Reschenberg 2021-02-04 19:41:30 +00:00
parent 6b8df6efbe
commit ced0045bea
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/mac/mozAccessible.h
View File

@ -27,7 +27,9 @@ namespace a11y {
inline mozAccessible* GetNativeFromGeckoAccessible(
mozilla::a11y::AccessibleOrProxy aAccOrProxy) {
MOZ_ASSERT(!aAccOrProxy.IsNull(), "Cannot get native from null accessible");
if (aAccOrProxy.IsNull()) {
return nil;
}
if (Accessible* acc = aAccOrProxy.AsAccessible()) {
mozAccessible* native = nil;
acc->GetNativeInterface((void**)&native);

10
accessible/mac/mozSelectableElements.mm
View File

@ -263,10 +263,12 @@ using namespace mozilla::a11y;
// we override this method.
AccessibleOrProxy parentAcc = [parent geckoAccessible];
if (!parentAcc.IsNull()) {
mozAccessible* directGrandparent =
GetNativeFromGeckoAccessible(parentAcc.Parent());
if ([directGrandparent isKindOfClass:[MOXWebAreaAccessible class]]) {
return [parent moxIgnoreWithParent:directGrandparent];
AccessibleOrProxy grandparentAcc = parentAcc.Parent();
if (mozAccessible* directGrandparent =
GetNativeFromGeckoAccessible(grandparentAcc)) {
if ([directGrandparent isKindOfClass:[MOXWebAreaAccessible class]]) {
return [parent moxIgnoreWithParent:directGrandparent];
}
}
}