From 8ac87b81e6295c75131703e4427f080c17473cc1 Mon Sep 17 00:00:00 2001 From: "aaronleventhal@moonset.net" Date: Wed, 18 Apr 2007 06:40:52 -0700 Subject: [PATCH] Bug 377800. Too many warnings for accessibility in console. r=surkov --- accessible/src/base/nsAccessibilityService.cpp | 4 +++- accessible/src/base/nsAccessible.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp index 5ad9a734b0c..7b6b5085a87 100644 --- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -1001,7 +1001,9 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessibleInWeakShell(nsIDOMNode *aNode nsresult nsAccessibilityService::InitAccessible(nsIAccessible *aAccessibleIn, nsIAccessible **aAccessibleOut) { - NS_ENSURE_TRUE(aAccessibleIn, NS_ERROR_FAILURE); + if (!aAccessibleIn) { + return NS_ERROR_FAILURE; // No accessible to init + } NS_ASSERTION(aAccessibleOut && !*aAccessibleOut, "Out param should already be cleared out"); nsCOMPtr privateAccessNode = do_QueryInterface(aAccessibleIn); diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 3f1cb858def..74841b58135 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -992,7 +992,9 @@ nsAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState) } nsCOMPtr content(do_QueryInterface(mDOMNode)); - NS_ENSURE_TRUE(content, NS_ERROR_FAILURE); + if (!content) { + return NS_OK; // On document, this is not an error + } // Set STATE_UNAVAILABLE state based on disabled attribute // The disabled attribute is mostly used in XUL elements and HTML forms, but