From 6ff0f9e270a3734a2622aa893c6d1a4235859ff2 Mon Sep 17 00:00:00 2001 From: "aaronleventhal%moonset.net" Date: Tue, 28 Jun 2005 16:49:13 +0000 Subject: [PATCH] Bug 298968. List items, tbody, thead and tfoot should be nameless. r=parente, sr=neil, a=mkaply --- accessible/src/base/nsAccessible.cpp | 2 +- accessible/src/html/nsHTMLTextAccessible.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 638165957b7e..35e6aaea5c1a 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -145,7 +145,7 @@ NS_IMETHODIMP nsAccessible::GetName(nsAString& aName) return NS_ERROR_FAILURE; // Node shut down } - PRBool canAggregateName = !mRoleMapEntry || + PRBool canAggregateName = mRoleMapEntry && mRoleMapEntry->nameRule == eNameOkFromChildren; if (content->IsContentOfType(nsIContent::eHTML)) { diff --git a/accessible/src/html/nsHTMLTextAccessible.h b/accessible/src/html/nsHTMLTextAccessible.h index 3e34870444c8..43fa4b5ff13d 100644 --- a/accessible/src/html/nsHTMLTextAccessible.h +++ b/accessible/src/html/nsHTMLTextAccessible.h @@ -126,6 +126,7 @@ public: NS_IMETHOD Shutdown() { nsresult rv = nsAccessibleWrap::Shutdown(); mBulletAccessible = nsnull; return rv; } NS_IMETHOD GetRole(PRUint32 *aRole) { *aRole = ROLE_LISTITEM; return NS_OK; } NS_IMETHOD GetState(PRUint32 *aState) { nsAccessibleWrap::GetState(aState); *aState &= ~STATE_FOCUSABLE; *aState |= STATE_READONLY; return NS_OK; } + NS_IMETHOD GetName(nsAString& aName) { aName.SetIsVoid(PR_TRUE); return NS_OK; } NS_IMETHOD GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); void CacheChildren(PRBool aWalkAnonContent); // Include bullet accessible protected: