Bug 740747 - dexpcom nsAccessible::GetName, r=surkov, tbsaunde

accessible/src/atk/ApplicationAccessibleWrap.cpp

@@ -690,14 +690,15 @@ ApplicationAccessibleWrap::Unload()
     // }
 }
 
-NS_IMETHODIMP
+ENameValueFlag
-ApplicationAccessibleWrap::GetName(nsAString& aName)
+ApplicationAccessibleWrap::Name(nsString& aName)
 {
   // ATK doesn't provide a way to obtain an application name (for example,
   // Firefox or Thunderbird) like IA2 does. Thus let's return an application
   // name as accessible name that was used to get a branding name (for example,
   // Minefield aka nightly Firefox or Daily aka nightly Thunderbird).
-  return GetAppName(aName);
+  GetAppName(aName);
+  return eNameOK;
 }
 
 NS_IMETHODIMP

accessible/src/atk/ApplicationAccessibleWrap.h

@@ -57,8 +57,7 @@ public:
     virtual bool Init();
 
     // nsAccessible
-    NS_IMETHOD GetName(nsAString &aName);
+    virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
-
     virtual bool AppendChild(nsAccessible* aChild);
     virtual bool RemoveChild(nsAccessible* aChild);
 

accessible/src/atk/nsAccessibleWrap.cpp

@@ -682,20 +682,16 @@ const gchar *
 getNameCB(AtkObject* aAtkObj)
 {
   nsAccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
-    if (!accWrap) {
+  if (!accWrap)
     return nsnull;
-    }
 
-    /* nsIAccessible is responsible for the non-NULL name */
   nsAutoString uniName;
-    nsresult rv = accWrap->GetName(uniName);
+  accWrap->Name(uniName);
-    NS_ENSURE_SUCCESS(rv, nsnull);
 
   NS_ConvertUTF8toUTF16 objName(aAtkObj->name);
-    if (!uniName.Equals(objName)) {
+  if (!uniName.Equals(objName))
-        atk_object_set_name(aAtkObj,
+    atk_object_set_name(aAtkObj, NS_ConvertUTF16toUTF8(uniName).get());
-                            NS_ConvertUTF16toUTF8(uniName).get());
+
-    }
   return aAtkObj->name;
 }
 
@@ -1043,8 +1039,8 @@ nsAccessibleWrap::FirePlatformEvent(AccEvent* aEvent)
 
     case nsIAccessibleEvent::EVENT_NAME_CHANGE:
       {
-        nsString newName;
+        nsAutoString newName;
-        accessible->GetName(newName);
+        accessible->Name(newName);
         NS_ConvertUTF16toUTF8 utf8Name(newName);
         if (!atkObj->name || !utf8Name.Equals(atkObj->name))
           atk_object_set_name(atkObj, utf8Name.get());

accessible/src/base/FocusManager.h

@@ -211,7 +211,7 @@ private:
     nsAutoString role;                                                         \
     GetAccService()->GetStringRole(aAccessible->Role(), role);                 \
     nsAutoString name;                                                         \
-    aAccessible->GetName(name);                                                \
+    aAccessible->Name(name);                                                   \
     printf(" role: %s, name: %s; ", NS_ConvertUTF16toUTF8(role).get(),         \
            NS_ConvertUTF16toUTF8(name).get());                                 \
     A11YDEBUG_FOCUS_LOG_DOMNODE(aAccessible->GetNode())                        \

accessible/src/base/nsAccessible.cpp

@@ -209,10 +209,9 @@ nsAccessible::nsAccessible(nsIContent* aContent, nsDocAccessible* aDoc) :
              NS_ConvertUTF16toUTF8(content->NodeInfo()->QualifiedName()).get(),
              (void *)content.get());
       nsAutoString buf;
-      if (NS_SUCCEEDED(GetName(buf))) {
+      Name(buf);
       printf(" Name:[%s]", NS_ConvertUTF16toUTF8(buf).get());
      }
-     }
      printf("\n");
    }
 #endif
@@ -278,45 +277,52 @@ nsAccessible::GetName(nsAString& aName)
   if (IsDefunct())
     return NS_ERROR_FAILURE;
 
+  nsAutoString name;
+  Name(name);
+  aName.Assign(name);
+
+  return NS_OK;
+}
+
+ENameValueFlag
+nsAccessible::Name(nsString& aName)
+{
+  aName.Truncate();
+
   GetARIAName(aName);
   if (!aName.IsEmpty())
-    return NS_OK;
+    return eNameOK;
 
   nsCOMPtr<nsIXBLAccessible> xblAccessible(do_QueryInterface(mContent));
   if (xblAccessible) {
     xblAccessible->GetAccessibleName(aName);
     if (!aName.IsEmpty())
-      return NS_OK;
+      return eNameOK;
   }
 
   nsresult rv = GetNameInternal(aName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   if (!aName.IsEmpty())
-    return NS_OK;
+    return eNameOK;
 
   // In the end get the name from tooltip.
-  nsIAtom *tooltipAttr = nsnull;
+  if (mContent->IsHTML()) {
-
+    if (mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::title, aName)) {
-  if (mContent->IsHTML())
+      aName.CompressWhitespace();
-    tooltipAttr = nsGkAtoms::title;
+      return eNameFromTooltip;
-  else if (mContent->IsXUL())
+    }
-    tooltipAttr = nsGkAtoms::tooltiptext;
+  } else if (mContent->IsXUL()) {
-  else
+    if (mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::tooltiptext, aName)) {
-    return NS_OK;
+      aName.CompressWhitespace();
-
+      return eNameFromTooltip;
-  // XXX: if CompressWhiteSpace worked on nsAString we could avoid a copy.
+    }
-  nsAutoString name;
+  } else {
-  if (mContent->GetAttr(kNameSpaceID_None, tooltipAttr, name)) {
+    return eNameOK;
-    name.CompressWhitespace();
-    aName = name;
-    return NS_OK_NAME_FROM_TOOLTIP;
   }
 
   if (rv != NS_OK_EMPTY_NAME)
     aName.SetIsVoid(true);
 
-  return NS_OK;
+  return eNameOK;
 }
 
 NS_IMETHODIMP
@@ -364,7 +370,7 @@ nsAccessible::Description(nsString& aDescription)
                                     nsGkAtoms::title;
         if (mContent->GetAttr(kNameSpaceID_None, descAtom, aDescription)) {
           nsAutoString name;
-          GetName(name);
+          Name(name);
           if (name.IsEmpty() || aDescription == name)
             // Don't use tooltip for a description if this object
             // has no name or the tooltip is the same as the name

accessible/src/base/nsAccessible.h

@@ -65,9 +65,25 @@ class nsHTMLImageMapAccessible;
 class nsHTMLLIAccessible;
 struct nsRoleMapEntry;
 class Relation;
+
 namespace mozilla {
 namespace a11y {
 class TableAccessible;
+
+/**
+ * Name type flags.
+ */
+enum ENameValueFlag {
+  /**
+   * Name either
+   *  a) present (not empty): !name.IsEmpty()
+   *  b) no name (was missed): name.IsVoid()
+   *  c) was left empty by the author on demand: name.IsEmpty() && !name.IsVoid()
+   */
+ eNameOK,
+ eNameFromTooltip // Tooltip was used as a name
+};
+
 }
 }
 class nsTextAccessible;
@@ -140,6 +156,11 @@ public:
    */
   virtual void Value(nsString& aValue);
 
+  /**
+   * Get the name of this accessible.
+   */
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
+
   /**
    * Return DOM node associated with this accessible.
    */

accessible/src/base/nsDocAccessible.cpp

@@ -213,26 +213,26 @@ NS_IMPL_RELEASE_INHERITED(nsDocAccessible, nsHyperTextAccessible)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessible
 
-NS_IMETHODIMP
+ENameValueFlag
-nsDocAccessible::GetName(nsAString& aName)
+nsDocAccessible::Name(nsString& aName)
 {
-  nsresult rv = NS_OK;
   aName.Truncate();
+
   if (mParent) {
-    rv = mParent->GetName(aName); // Allow owning iframe to override the name
+    mParent->Name(aName); // Allow owning iframe to override the name
   }
   if (aName.IsEmpty()) {
     // Allow name via aria-labelledby or title attribute
-    rv = nsAccessible::GetName(aName);
+    nsAccessible::Name(aName);
   }
   if (aName.IsEmpty()) {
-    rv = GetTitle(aName);   // Try title element
+    GetTitle(aName);   // Try title element
   }
   if (aName.IsEmpty()) {   // Last resort: use URL
-    rv = GetURL(aName);
+    GetURL(aName);
   }
  
-  return rv;
+  return eNameOK;
 }
 
 // nsAccessible public method

accessible/src/base/nsDocAccessible.h

@@ -92,7 +92,6 @@ public:
   virtual ~nsDocAccessible();
 
   // nsIAccessible
-  NS_IMETHOD GetName(nsAString& aName);
   NS_IMETHOD GetAttributes(nsIPersistentProperties **aAttributes);
   NS_IMETHOD TakeFocus(void);
 
@@ -111,6 +110,7 @@ public:
   virtual nsIDocument* GetDocumentNode() const { return mDocument; }
 
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual void Description(nsString& aDescription);
   virtual nsAccessible* FocusedChild();
   virtual mozilla::a11y::role NativeRole();

accessible/src/base/nsRootAccessible.cpp

@@ -110,27 +110,22 @@ nsRootAccessible::~nsRootAccessible()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// nsIAccessible
+// nsAccessible
 
-/* readonly attribute AString name; */
+ENameValueFlag
-NS_IMETHODIMP
+nsRootAccessible::Name(nsString& aName)
-nsRootAccessible::GetName(nsAString& aName)
 {
   aName.Truncate();
 
-  if (!mDocument) {
-    return NS_ERROR_FAILURE;
-  }
-
   if (mRoleMapEntry) {
-    nsAccessible::GetName(aName);
+    nsAccessible::Name(aName);
-    if (!aName.IsEmpty()) {
+    if (!aName.IsEmpty())
-      return NS_OK;
+      return eNameOK;
-    }
   }
 
   nsCOMPtr<nsIDOMDocument> document = do_QueryInterface(mDocument);
-  return document->GetTitle(aName);
+  document->GetTitle(aName);
+  return eNameOK;
 }
 
 role

accessible/src/base/nsRootAccessible.h

@@ -62,9 +62,6 @@ public:
                    nsIPresShell* aPresShell);
   virtual ~nsRootAccessible();
 
-  // nsIAccessible
-  NS_IMETHOD GetName(nsAString& aName);
-
   // nsIDOMEventListener
   NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 
@@ -72,6 +69,7 @@ public:
   virtual void Shutdown();
 
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual Relation RelationByType(PRUint32 aType);
   virtual mozilla::a11y::role NativeRole();
   virtual PRUint64 NativeState();

accessible/src/base/nsTextEquivUtils.cpp

@@ -48,6 +48,8 @@
 
 #include "nsArrayUtils.h"
 
+using namespace mozilla::a11y;
+
 #define NS_OK_NO_NAME_CLAUSE_HANDLED \
 NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x24)
 
@@ -227,19 +229,16 @@ nsTextEquivUtils::AppendFromAccessible(nsAccessible *aAccessible,
       return rv;
   }
 
-  nsAutoString text;
-  nsresult rv = aAccessible->GetName(text);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   bool isEmptyTextEquiv = true;
 
   // If the name is from tooltip then append it to result string in the end
   // (see h. step of name computation guide).
-  if (rv != NS_OK_NAME_FROM_TOOLTIP)
+  nsAutoString text;
+  if (aAccessible->Name(text) != eNameFromTooltip)
     isEmptyTextEquiv = !AppendString(aString, text);
 
   // Implementation of f. step.
-  rv = AppendFromValue(aAccessible, aString);
+  nsresult rv = AppendFromValue(aAccessible, aString);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (rv != NS_OK_NO_NAME_CLAUSE_HANDLED)

accessible/src/generic/ApplicationAccessible.cpp

@@ -96,8 +96,8 @@ ApplicationAccessible::GetPreviousSibling(nsIAccessible** aPreviousSibling)
   return NS_OK;
 }
 
-NS_IMETHODIMP
+ENameValueFlag
-ApplicationAccessible::GetName(nsAString& aName)
+ApplicationAccessible::Name(nsString& aName)
 {
   aName.Truncate();
 
@@ -105,12 +105,14 @@ ApplicationAccessible::GetName(nsAString& aName)
     mozilla::services::GetStringBundleService();
 
   NS_ASSERTION(bundleService, "String bundle service must be present!");
-  NS_ENSURE_STATE(bundleService);
+  if (!bundleService)
+    return eNameOK;
 
   nsCOMPtr<nsIStringBundle> bundle;
   nsresult rv = bundleService->CreateBundle("chrome://branding/locale/brand.properties",
                                             getter_AddRefs(bundle));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_FAILED(rv))
+    return eNameOK;
 
   nsXPIDLString appName;
   rv = bundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
@@ -121,7 +123,7 @@ ApplicationAccessible::GetName(nsAString& aName)
   }
 
   aName.Assign(appName);
-  return NS_OK;
+  return eNameOK;
 }
 
 void

accessible/src/generic/ApplicationAccessible.h

@@ -79,7 +79,6 @@ public:
   NS_IMETHOD GetParent(nsIAccessible **aParent);
   NS_IMETHOD GetNextSibling(nsIAccessible **aNextSibling);
   NS_IMETHOD GetPreviousSibling(nsIAccessible **aPreviousSibling);
-  NS_IMETHOD GetName(nsAString &aName);
   NS_IMETHOD GetAttributes(nsIPersistentProperties **aAttributes);
   NS_IMETHOD GroupPosition(PRInt32 *aGroupLevel, PRInt32 *aSimilarItemsInGroup,
                            PRInt32 *aPositionInGroup);
@@ -101,6 +100,7 @@ public:
   virtual bool IsPrimaryForNode() const;
 
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual void ApplyARIAState(PRUint64* aState);
   virtual void Description(nsString& aDescription);
   virtual void Value(nsString& aValue);

accessible/src/html/nsHTMLSelectAccessible.cpp

@@ -594,7 +594,7 @@ nsHTMLComboboxAccessible::Value(nsString& aValue)
   // Use accessible name of selected option.
   nsAccessible* option = SelectedOption();
   if (option)
-    option->GetName(aValue);
+    option->Name(aValue);
 }
 
 PRUint8

accessible/src/html/nsHTMLTextAccessible.cpp

@@ -68,12 +68,12 @@ nsHTMLTextAccessible::
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTextAccessible, nsTextAccessible)
 
-NS_IMETHODIMP
+ENameValueFlag
-nsHTMLTextAccessible::GetName(nsAString& aName)
+nsHTMLTextAccessible::Name(nsString& aName)
 {
   // Text node, ARIA can't be used.
   aName = mText;
-  return NS_OK;
+  return eNameOK;
 }
 
 role
@@ -348,14 +348,11 @@ nsHTMLListBulletAccessible::IsPrimaryForNode() const
 ////////////////////////////////////////////////////////////////////////////////
 // nsHTMLListBulletAccessible: nsAccessible
 
-NS_IMETHODIMP
+ENameValueFlag
-nsHTMLListBulletAccessible::GetName(nsAString &aName)
+nsHTMLListBulletAccessible::Name(nsString &aName)
 {
   aName.Truncate();
 
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;
-
   // Native anonymous content, ARIA can't be used. Get list bullet text.
   nsBlockFrame* blockFrame = do_QueryFrame(mContent->GetPrimaryFrame());
   NS_ASSERTION(blockFrame, "No frame for list item!");
@@ -366,7 +363,7 @@ nsHTMLListBulletAccessible::GetName(nsAString &aName)
     aName.Append(' ');
   }
 
-  return NS_OK;
+  return eNameOK;
 }
 
 role

accessible/src/html/nsHTMLTextAccessible.h

@@ -55,10 +55,8 @@ public:
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
-  // nsIAccessible
-  NS_IMETHOD GetName(nsAString& aName);
-
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
   virtual mozilla::a11y::role NativeRole();
   virtual PRUint64 NativeState();
@@ -129,13 +127,11 @@ class nsHTMLListBulletAccessible : public nsLeafAccessible
 public:
   nsHTMLListBulletAccessible(nsIContent* aContent, nsDocAccessible* aDoc);
 
-  // nsIAccessible
-  NS_IMETHOD GetName(nsAString& aName);
-
   // nsAccessNode
   virtual bool IsPrimaryForNode() const;
 
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual mozilla::a11y::role NativeRole();
   virtual PRUint64 NativeState();
   virtual void AppendTextTo(nsAString& aText, PRUint32 aStartOffset = 0,

accessible/src/mac/mozAccessible.mm

@@ -514,7 +514,7 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   nsAutoString title;
-  mGeckoAccessible->GetName (title);
+  mGeckoAccessible->Name(title);
   return title.IsEmpty() ? nil : [NSString stringWithCharacters:title.BeginReading() length:title.Length()];
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;

accessible/src/msaa/nsAccessibleWrap.cpp

@@ -285,9 +285,7 @@ __try {
     return CO_E_OBJNOTCONNECTED;
 
   nsAutoString name;
-  nsresult rv = xpAccessible->GetName(name);
+  xpAccessible->Name(name);
-  if (NS_FAILED(rv))
-    return GetHRESULT(rv);
 
   // The name was not provided, e.g. no alt attribute for an image. A screen
   // reader may choose to invent its own accessible name, e.g. from an image src

accessible/src/msaa/nsXULMenuAccessibleWrap.cpp

@@ -38,6 +38,8 @@
 #include "nsXULMenuAccessibleWrap.h"
 #include "nsINameSpaceManager.h"
 
+using namespace mozilla::a11y;
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULMenuAccessibleWrap
 ////////////////////////////////////////////////////////////////////////////////
@@ -48,21 +50,19 @@ nsXULMenuitemAccessibleWrap::
 {
 }
 
-NS_IMETHODIMP
+ENameValueFlag
-nsXULMenuitemAccessibleWrap::GetName(nsAString& aName)
+nsXULMenuitemAccessibleWrap::Name(nsString& aName)
 {
   // XXX This should be done in get_accName() so that nsIAccessible::GetName()]
   // provides the same results on all platforms
-  nsresult rv = nsXULMenuitemAccessible::GetName(aName);
+  nsXULMenuitemAccessible::Name(aName);
-  if (NS_FAILED(rv)) {
+  if (aName.IsEmpty())
-    return rv;
+    return eNameOK;
-  }
   
   nsAutoString accel;
   mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::acceltext, accel);
-  if (!accel.IsEmpty()) {
+  if (!accel.IsEmpty())
     aName += NS_LITERAL_STRING("\t") + accel;
-  }
 
-  return NS_OK;
+  return eNameOK;
 }

accessible/src/msaa/nsXULMenuAccessibleWrap.h

@@ -47,7 +47,7 @@ public:
   virtual ~nsXULMenuitemAccessibleWrap() {}
 
   // nsIAccessible
-  NS_IMETHOD GetName(nsAString& aName);
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
 };
 
 #endif

accessible/src/xul/nsXULAlertAccessible.cpp

@@ -66,13 +66,13 @@ nsXULAlertAccessible::NativeState()
   return nsAccessible::NativeState() | states::ALERT;
 }
 
-NS_IMETHODIMP
+ENameValueFlag
-nsXULAlertAccessible::GetName(nsAString& aName)
+nsXULAlertAccessible::Name(nsString& aName)
 {
   // Screen readers need to read contents of alert, not the accessible name.
   // If we have both some screen readers will read the alert twice.
   aName.Truncate();
-  return NS_OK;
+  return eNameOK;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

accessible/src/xul/nsXULAlertAccessible.h

@@ -51,10 +51,8 @@ public:
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  // nsIAccessible
-  NS_IMETHOD GetName(nsAString& aName);
-
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual mozilla::a11y::role NativeRole();
   virtual PRUint64 NativeState();
 

accessible/src/xul/nsXULTreeAccessible.cpp

@@ -1176,16 +1176,13 @@ NS_IMPL_RELEASE_INHERITED(nsXULTreeItemAccessible, nsXULTreeItemAccessibleBase)
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULTreeItemAccessible: nsIAccessible implementation
 
-NS_IMETHODIMP
+ENameValueFlag
-nsXULTreeItemAccessible::GetName(nsAString& aName)
+nsXULTreeItemAccessible::Name(nsString& aName)
 {
   aName.Truncate();
 
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;
-
   GetCellName(mColumn, aName);
-  return NS_OK;
+  return eNameOK;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1197,7 +1194,7 @@ nsXULTreeItemAccessible::Init()
   if (!nsXULTreeItemAccessibleBase::Init())
     return false;
 
-  GetName(mCachedName);
+  Name(mCachedName);
   return true;
 }
 
@@ -1235,7 +1232,7 @@ nsXULTreeItemAccessible::RowInvalidated(PRInt32 aStartColIdx,
                                         PRInt32 aEndColIdx)
 {
   nsAutoString name;
-  GetName(name);
+  Name(name);
 
   if (name != mCachedName) {
     nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_NAME_CHANGE, this);

accessible/src/xul/nsXULTreeAccessible.h

@@ -267,13 +267,12 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsXULTreeItemAccessible,
                                            nsXULTreeItemAccessibleBase)
 
-  NS_IMETHOD GetName(nsAString& aName);
-
   // nsAccessNode
   virtual bool Init();
   virtual void Shutdown();
 
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual mozilla::a11y::role NativeRole();
 
   // nsXULTreeItemAccessibleBase

accessible/src/xul/nsXULTreeGridAccessible.cpp

@@ -657,14 +657,11 @@ nsXULTreeGridRowAccessible::NativeRole()
   return roles::ROW;
 }
 
-NS_IMETHODIMP
+ENameValueFlag
-nsXULTreeGridRowAccessible::GetName(nsAString& aName)
+nsXULTreeGridRowAccessible::Name(nsString& aName)
 {
   aName.Truncate();
 
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;
-
   // XXX: the row name sholdn't be a concatenation of cell names (bug 664384).
   nsCOMPtr<nsITreeColumn> column = nsCoreUtils::GetFirstSensibleColumn(mTree);
   while (column) {
@@ -678,7 +675,7 @@ nsXULTreeGridRowAccessible::GetName(nsAString& aName)
     column = nsCoreUtils::GetNextSensibleColumn(column);
   }
 
-  return NS_OK;
+  return eNameOK;
 }
 
 nsAccessible*
@@ -844,13 +841,13 @@ nsXULTreeGridCellAccessible::FocusedChild()
   return nsnull;
 }
 
-NS_IMETHODIMP
+ENameValueFlag
-nsXULTreeGridCellAccessible::GetName(nsAString& aName)
+nsXULTreeGridCellAccessible::Name(nsString& aName)
 {
   aName.Truncate();
 
-  if (IsDefunct() || !mTreeView)
+  if (!mTreeView)
-    return NS_ERROR_FAILURE;
+    return eNameOK;
 
   mTreeView->GetCellText(mRow, mColumn, aName);
 
@@ -862,7 +859,7 @@ nsXULTreeGridCellAccessible::GetName(nsAString& aName)
   if (aName.IsEmpty())
     mTreeView->GetCellValue(mRow, mColumn, aName);
 
-  return NS_OK;
+  return eNameOK;
 }
 
 NS_IMETHODIMP

accessible/src/xul/nsXULTreeGridAccessible.h

@@ -103,7 +103,7 @@ public:
 
   // nsAccessible
   virtual mozilla::a11y::role NativeRole();
-  NS_IMETHOD GetName(nsAString& aName);
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual nsAccessible* ChildAtPoint(PRInt32 aX, PRInt32 aY,
                                      EWhichChildAtPoint aWhichChild);
 
@@ -155,7 +155,6 @@ public:
 
   // nsIAccessible
 
-  NS_IMETHOD GetName(nsAString& aName);
   NS_IMETHOD GetBounds(PRInt32 *aX, PRInt32 *aY,
                        PRInt32 *aWidth, PRInt32 *aHeight);
 
@@ -170,6 +169,7 @@ public:
   virtual bool IsPrimaryForNode() const;
 
   // nsAccessible
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
   virtual nsAccessible* FocusedChild();
   virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
   virtual PRInt32 IndexInParent() const;