bug 455443 and bug 703770 - fix missed review nits r=me

This commit is contained in:
Trevor Saunders 2011-12-09 02:53:05 -05:00
parent 1b2ce620b0
commit 97fd00022b
2 changed files with 5 additions and 8 deletions

View File

@ -354,9 +354,8 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
nsCOMPtr<nsIAccessible> accessibleParent(mGeckoAccessible->GetUnignoredParent());
if (accessibleParent) {
id nativeParent = GetNativeFromGeckoAccessible(accessibleParent);
if (nativeParent) {
if (nativeParent)
return mParent = GetClosestInterestingAccessible(nativeParent);
}
}
// GetUnignoredParent() returns null when there is no unignored accessible all the way up to
@ -368,8 +367,7 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
id nativeParent = GetNativeFromGeckoAccessible(static_cast<nsIAccessible*>(root));
NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self);
mParent = GetClosestInterestingAccessible(nativeParent);
return mParent;
return mParent = GetClosestInterestingAccessible(nativeParent);
NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
}

View File

@ -81,12 +81,11 @@ static id <mozAccessible, mozView> getNativeViewFromRootAccessible (nsAccessible
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if ([attribute isEqualToString:NSAccessibilityMainAttribute]) {
if ([attribute isEqualToString:NSAccessibilityMainAttribute])
return [NSNumber numberWithBool:[[self window] isMainWindow]];
}
if ([attribute isEqualToString:NSAccessibilityMinimizedAttribute]) {
if ([attribute isEqualToString:NSAccessibilityMinimizedAttribute])
return [NSNumber numberWithBool:[[self window] isMiniaturized]];
}
return [super accessibilityAttributeValue:attribute];
NS_OBJC_END_TRY_ABORT_BLOCK_NIL;