Bug 1826856 - Remove sync AnchorURIAt method. r=Jamie

We can get the URI using the Value method that is already cached when
caching is enabled.

Differential Revision: https://phabricator.services.mozilla.com/D176067

UltraBlame original commit: f191e51b0456ff8a698605d0db639b6d91a49854

Author: marco-c

accessible/atk/nsMaiHyperlink.cpp

@@ -143,22 +143,21 @@ void finalizeCB(GObject* aObj) {
 
 gchar* getUriCB(AtkHyperlink* aLink, gint aLinkIndex) {
   MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
-  if (!maiLink) return nullptr;
-
-  nsAutoCString cautoStr;
-  if (LocalAccessible* hyperlink = maiLink->GetAccHyperlink()) {
-    nsCOMPtr<nsIURI> uri = hyperlink->AnchorURIAt(aLinkIndex);
-    if (!uri) return nullptr;
-
-    nsresult rv = uri->GetSpec(cautoStr);
-    NS_ENSURE_SUCCESS(rv, nullptr);
+  if (!maiLink) {
+    return nullptr;
+  }
 
-    return g_strdup(cautoStr.get());
+  Accessible* acc = maiLink->Acc();
+  if (!acc) {
+    return nullptr;
   }
 
-  bool valid;
-  maiLink->Proxy()->AnchorURIAt(aLinkIndex, cautoStr, &valid);
-  if (!valid) return nullptr;
+  nsAutoCString cautoStr;
+  nsCOMPtr<nsIURI> uri = acc->AnchorURIAt(aLinkIndex);
+  if (!uri) return nullptr;
+
+  nsresult rv = uri->GetSpec(cautoStr);
+  NS_ENSURE_SUCCESS(rv, nullptr);
 
   return g_strdup(cautoStr.get());
 }

accessible/basetypes/Accessible.cpp

@@ -7,6 +7,7 @@
 #include "AccGroupInfo.h"
 #include "ARIAMap.h"
 #include "nsAccUtils.h"
+#include "nsIURI.h"
 #include "Relation.h"
 #include "States.h"
 #include "mozilla/a11y/FocusManager.h"
@@ -382,13 +383,40 @@ uint32_t Accessible::AnchorCount() {
   return 1;
 }
 
-Accessible* Accessible::AnchorAt(uint32_t aAnchorIndex) {
+Accessible* Accessible::AnchorAt(uint32_t aAnchorIndex) const {
   if (IsImageMap()) {
     return ChildAt(aAnchorIndex);
   }
 
   MOZ_ASSERT(IsLink(), "GetAnchor is called on not hyper link!");
-  return aAnchorIndex == 0 ? this : nullptr;
+  return aAnchorIndex == 0 ? const_cast<Accessible*>(this) : nullptr;
+}
+
+already_AddRefed<nsIURI> Accessible::AnchorURIAt(uint32_t aAnchorIndex) const {
+  Accessible* anchor = nullptr;
+
+  if (IsTextLeaf() || IsImage()) {
+    for (Accessible* parent = Parent(); parent && !parent->IsOuterDoc();
+         parent = parent->Parent()) {
+      if (parent->IsLink()) {
+        anchor = parent->AnchorAt(aAnchorIndex);
+      }
+    }
+  } else {
+    anchor = AnchorAt(aAnchorIndex);
+  }
+
+  if (anchor) {
+    RefPtr<nsIURI> uri;
+    nsAutoString spec;
+    anchor->Value(spec);
+    nsresult rv = NS_NewURI(getter_AddRefs(uri), spec);
+    if (NS_SUCCEEDED(rv)) {
+      return uri.forget();
+    }
+  }
+
+  return nullptr;
 }
 
 bool Accessible::IsSearchbox() const {

accessible/basetypes/Accessible.h

@@ -17,6 +17,8 @@ class nsStaticAtom;
 
 struct nsRoleMapEntry;
 
+class nsIURI;
+
 namespace mozilla {
 namespace a11y {
 
@@ -588,7 +590,12 @@ class Accessible {
 
 
 
-  Accessible* AnchorAt(uint32_t aAnchorIndex);
+  virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) const;
+
+  
+
+
+  Accessible* AnchorAt(uint32_t aAnchorIndex) const;
 
 
 

accessible/generic/BaseAccessibles.cpp

@@ -138,24 +138,6 @@ KeyBinding LinkableAccessible::AccessKey() const {
 
 
 
-already_AddRefed<nsIURI> LinkableAccessible::AnchorURIAt(
-    uint32_t aAnchorIndex) const {
-  bool isLink;
-  const LocalAccessible* actionAcc = ActionWalk(&isLink);
-  if (isLink) {
-    NS_ASSERTION(actionAcc->IsLink(), "HyperLink isn't implemented.");
-
-    if (actionAcc->IsLink()) {
-      return actionAcc->AnchorURIAt(aAnchorIndex);
-    }
-  }
-
-  return nullptr;
-}
-
-
-
-
 
 uint64_t DummyAccessible::NativeState() const { return 0; }
 uint64_t DummyAccessible::NativeInteractiveState() const { return 0; }

accessible/generic/BaseAccessibles.h

@@ -66,9 +66,6 @@ class LinkableAccessible : public AccessibleWrap {
 
   const LocalAccessible* ActionWalk(bool* aIsLink = nullptr,
                                     bool* aIsOnclick = nullptr) const;
-  
-  virtual already_AddRefed<nsIURI> AnchorURIAt(
-      uint32_t aAnchorIndex) const override;
 
  protected:
   virtual ~LinkableAccessible() {}

accessible/generic/LocalAccessible.cpp

@@ -70,7 +70,6 @@
 #include "nsReadableUtils.h"
 #include "prdtoa.h"
 #include "nsAtom.h"
-#include "nsIURI.h"
 #include "nsArrayUtils.h"
 #include "nsWhitespaceTokenizer.h"
 #include "nsAttrName.h"
@@ -2776,12 +2775,6 @@ bool LocalAccessible::IsLink() const {
   return mParent && mParent->IsHyperText() && !IsText();
 }
 
-already_AddRefed<nsIURI> LocalAccessible::AnchorURIAt(
-    uint32_t aAnchorIndex) const {
-  MOZ_ASSERT(IsLink(), "AnchorURIAt is called on not hyper link!");
-  return nullptr;
-}
-
 
 
 

accessible/generic/LocalAccessible.h

@@ -514,11 +514,6 @@ class LocalAccessible : public nsISupports, public Accessible {
   virtual bool IsLink() const override;
 
 
-
-
-  virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) const;
-
-  
 
 
 

accessible/html/HTMLImageMapAccessible.cpp

@@ -40,20 +40,6 @@ role HTMLImageMapAccessible::NativeRole() const { return roles::IMAGE_MAP; }
 
 
 
-already_AddRefed<nsIURI> HTMLImageMapAccessible::AnchorURIAt(
-    uint32_t aAnchorIndex) const {
-  LocalAccessible* area = LocalChildAt(aAnchorIndex);
-  if (!area) return nullptr;
-
-  nsIContent* linkContent = area->GetContent();
-  return linkContent && linkContent->IsElement()
-             ? linkContent->AsElement()->GetHrefURI()
-             : nullptr;
-}
-
-
-
-
 void HTMLImageMapAccessible::UpdateChildAreas(bool aDoFireEvents) {
   if (!mContent || !mContent->GetPrimaryFrame()) {
     return;

accessible/html/HTMLImageMapAccessible.h

@@ -26,10 +26,6 @@ class HTMLImageMapAccessible final : public ImageAccessible {
   virtual a11y::role NativeRole() const override;
 
 
-  virtual already_AddRefed<nsIURI> AnchorURIAt(
-      uint32_t aAnchorIndex) const override;
-
-  
 
 
   void UpdateChildAreas(bool aDoFireEvents = true);

accessible/html/HTMLLinkAccessible.cpp

@@ -120,11 +120,6 @@ bool HTMLLinkAccessible::IsLink() const {
   return true;
 }
 
-already_AddRefed<nsIURI> HTMLLinkAccessible::AnchorURIAt(
-    uint32_t aAnchorIndex) const {
-  return aAnchorIndex == 0 ? mContent->AsElement()->GetHrefURI() : nullptr;
-}
-