nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1642448 - Replace remaining NSAssert statements in accessible/mac/ with MOZ_ASSERT's. r=morgan

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D77874
This commit is contained in:
Zeke Medley 2020-06-02 20:40:37 +00:00
parent 201362531f
commit 533e723a19
3 changed files with 4 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
accessible/mac/mozAccessible.mm
View file

@ -756,7 +756,7 @@ struct RoleDescrComparator {
if (docAcc) nativeWindow = static_cast<NSWindow*>(docAcc->GetNativeWindow()); if (docAcc) nativeWindow = static_cast<NSWindow*>(docAcc->GetNativeWindow());
NSAssert1(nativeWindow, @"Could not get native window for %@", self); MOZ_ASSERT(nativeWindow, "Couldn't get native window");
return nativeWindow; return nativeWindow;
NS_OBJC_END_TRY_ABORT_BLOCK_NIL; NS_OBJC_END_TRY_ABORT_BLOCK_NIL;

4
accessible/mac/mozRootAccessible.mm
View file

@ -54,7 +54,7 @@ static id<mozAccessible, mozView> getNativeViewFromRootAccessible(Accessible* aA
if (mParallelView) if (mParallelView)
return [mParallelView accessibilityAttributeValue:NSAccessibilityParentAttribute]; return [mParallelView accessibilityAttributeValue:NSAccessibilityParentAttribute];
NSAssert(mParallelView, @"we're a root accessible w/o native view?"); MOZ_ASSERT(mParallelView, "we're a root accessible w/o native view?");
return [super moxParent]; return [super moxParent];
NS_OBJC_END_TRY_ABORT_BLOCK_NIL; NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
@ -68,7 +68,7 @@ static id<mozAccessible, mozView> getNativeViewFromRootAccessible(Accessible* aA
- (id)representedView { - (id)representedView {
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
NSAssert(mParallelView, @"root accessible does not have a native parallel view."); MOZ_ASSERT(mParallelView, "root accessible does not have a native parallel view.");
return mParallelView; return mParallelView;

2
accessible/mac/mozTableAccessible.mm
View file

@ -38,7 +38,7 @@
if (Accessible* acc = [mParent geckoAccessible].AsAccessible()) { if (Accessible* acc = [mParent geckoAccessible].AsAccessible()) {
TableAccessible* table = acc->AsTable(); TableAccessible* table = acc->AsTable();
NSAssert(table, @"Got null table when fetching column children!"); MOZ_ASSERT(table, "Got null table when fetching column children!");
uint32_t numRows = table->RowCount(); uint32_t numRows = table->RowCount();
for (uint32_t j = 0; j < numRows; j++) { for (uint32_t j = 0; j < numRows; j++) {