bug 428477 - Rename nsIAccessibleHyperLink::anchorsCount to nsiAccessibleHyperLink::anchorCount for better consistency r=aaronlev a1.9=beltzner

accessible/public/nsIAccessibleHyperLink.idl

@@ -47,7 +47,7 @@ interface nsIAccessible;
  * A cross-platform interface that supports hyperlink-specific properties and
  * methods.  Anchors, image maps, xul:labels with class="text-link" implement this interface.
  */
-[scriptable, uuid(fe1dd8c0-d50a-4634-b51d-2b20bfb1e231)]
+[scriptable, uuid(38c60bfa-6040-4bfe-93f2-acd6a909bb60)]
 interface nsIAccessibleHyperLink : nsISupports
 {
   /**
@@ -87,7 +87,7 @@ interface nsIAccessibleHyperLink : nsISupports
    * This anchor is, for example, the visible output of the html:a tag.
    * With an Image Map, reflects the actual areas within the map.
    */
-  readonly attribute long anchorsCount;
+  readonly attribute long anchorCount;
 
   /**
    * Returns the URI at the given index.

accessible/src/atk/nsMaiHyperlink.cpp

@@ -286,7 +286,7 @@ getAnchorCountCB(AtkHyperlink *aLink)
     NS_ENSURE_TRUE(accHyperlink, -1);
 
     PRInt32 count = -1;
-    nsresult rv = accHyperlink->GetAnchorsCount(&count);
+    nsresult rv = accHyperlink->GetAnchorCount(&count);
     return (NS_FAILED(rv)) ? -1 : static_cast<gint>(count);
 }
 

accessible/src/base/nsAccessible.cpp

@@ -3259,12 +3259,12 @@ NS_IMETHODIMP nsAccessible::SelectAllSelection(PRBool *_retval)
 // nsIAccessibleHyperLink, which helps determine where it is located
 // within containing text
 
-// readonly attribute long nsIAccessibleHyperLink::anchorsCount
+// readonly attribute long nsIAccessibleHyperLink::anchorCount
 NS_IMETHODIMP
-nsAccessible::GetAnchorsCount(PRInt32 *aAnchorsCount)
+nsAccessible::GetAnchorCount(PRInt32 *aAnchorCount)
 {
-  NS_ENSURE_ARG_POINTER(aAnchorsCount);
-  *aAnchorsCount = 1;
+  NS_ENSURE_ARG_POINTER(aAnchorCount);
+  *aAnchorCount = 1;
   return NS_OK;
 }
 

accessible/src/html/nsHTMLImageAccessible.cpp

@@ -226,14 +226,14 @@ NS_IMETHODIMP nsHTMLImageAccessible::DoAction(PRUint8 index)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessibleHyperLink
 NS_IMETHODIMP
-nsHTMLImageAccessible::GetAnchorsCount(PRInt32 *aAnchors)
+nsHTMLImageAccessible::GetAnchorCount(PRInt32 *aAnchorCount)
 {
-  NS_ENSURE_ARG_POINTER(aAnchors);
+  NS_ENSURE_ARG_POINTER(aAnchorCount);
 
   if (!mMapElement)
-    return nsLinkableAccessible::GetAnchorsCount(aAnchors);
+    return nsLinkableAccessible::GetAnchorCount(aAnchorCount);
 
-  return GetChildCount(aAnchors);
+  return GetChildCount(aAnchorCount);
 }
 
 NS_IMETHODIMP

accessible/src/html/nsHTMLImageAccessible.h

@@ -67,7 +67,7 @@ public:
   NS_IMETHOD DoAction(PRUint8 index);
 
   // nsIAccessibleHyperLink
-  NS_IMETHOD GetAnchorsCount(PRInt32 *aAnchors);
+  NS_IMETHOD GetAnchorCount(PRInt32 *aAnchorCount);
   NS_IMETHOD GetURI(PRInt32 aIndex, nsIURI **aURI);
   NS_IMETHOD GetAnchor(PRInt32 aIndex, nsIAccessible **aAccessible);
 

accessible/tests/mochitest/test_nsIAccessibleHyperLink.html

@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=418368
                       aEndIndex)
     {
       is(aAcc.finalRole, aRole, "Wrong role for ID " + aID + "!");
-      is(aAcc.anchorsCount, aAnchors, "Wrong number of anchors for ID "
+      is(aAcc.anchorCount, aAnchors, "Wrong number of anchors for ID "
                                       + aID + "!");
       is(aAcc.getAnchor(0).name, aName, "Wrong name for ID "
                                         + aID + "!");