bug 657719 - followup nsAccessible::IsValid() -> nsAccessible::IsLink…

…Valid() r=surkov

From e703a428b799fe24d5244e7a4566fd3fbe0f76a7 Mon Sep 17 00:00:00 2001
 nsAccessible::IsLinkValid()
---
 accessible/src/atk/nsMaiHyperlink.cpp        |    2 +-
 accessible/src/base/nsAccessible.cpp         |   14 +-------------
 accessible/src/base/nsAccessible.h           |   12 +++++++++++-
 accessible/src/msaa/CAccessibleHyperlink.cpp |    2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

accessible/src/atk/nsMaiHyperlink.cpp

@@ -264,7 +264,7 @@ isValidCB(AtkHyperlink *aLink)
     nsAccessible* hyperlink = get_accessible_hyperlink(aLink);
     NS_ENSURE_TRUE(hyperlink, FALSE);
 
-    return static_cast<gboolean>(hyperlink->IsValid());
+    return static_cast<gboolean>(hyperlink->IsLinkValid());
 }
 
 gint

accessible/src/base/Makefile.in

@@ -87,6 +87,7 @@ EXPORTS = \
   nsAccessible.h \
   nsAccessNode.h \
   nsARIAMap.h \
+	States.h \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

accessible/src/base/nsAccessible.cpp

@@ -2612,7 +2612,7 @@ nsAccessible::GetValid(PRBool *aValid)
   if (IsDefunct())
     return NS_ERROR_FAILURE;
 
-  *aValid = IsValid();
+  *aValid = IsLinkValid();
   return NS_OK;
 }
 
@@ -2920,18 +2920,6 @@ nsAccessible::EndOffset()
   return hyperText ? (hyperText->GetChildOffset(this) + 1) : 0;
 }
 
-bool
-nsAccessible::IsValid()
-{
-  NS_PRECONDITION(IsHyperLink(), "IsValid is called on not hyper link!");
-
-  return (0 == (State() & states::INVALID));
-  // XXX In order to implement this we would need to follow every link
-  // Perhaps we can get information about invalid links from the cache
-  // In the mean time authors can use role="link" aria-invalid="true"
-  // to force it for links they internally know to be invalid
-}
-
 PRUint32
 nsAccessible::AnchorCount()
 {

accessible/src/base/nsAccessible.h

@@ -40,6 +40,7 @@
 #define _nsAccessible_H_
 
 #include "nsAccessNodeWrap.h"
+#include "States.h"
 
 #include "nsIAccessible.h"
 #include "nsIAccessibleHyperLink.h"
@@ -421,7 +422,16 @@ class nsAccessible : public nsAccessNodeWrap,
   /**
    * Return true if the link is valid (e. g. points to a valid URL).
    */
-  virtual bool IsValid();
+  inline bool IsLinkValid()
+  {
+    NS_PRECONDITION(IsHyperLink(), "IsLinkValid is called on not hyper link!");
+
+    // XXX In order to implement this we would need to follow every link
+    // Perhaps we can get information about invalid links from the cache
+    // In the mean time authors can use role="link" aria-invalid="true"
+    // to force it for links they internally know to be invalid
+    return (0 == (State() & states::INVALID));
+  }
 
   /**
    * Return true if the link currently has the focus.

accessible/src/msaa/CAccessibleHyperlink.cpp

@@ -188,7 +188,7 @@ __try {
   if (thisObj->IsDefunct() || !thisObj->IsHyperLink())
     return E_FAIL;
 
-  *aValid = thisObj->IsValid();
+  *aValid = thisObj->IsLinkValid();
   return S_OK;
 
 } __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }