From 1196c8b377a8856af441afd816c625bc00771ff6 Mon Sep 17 00:00:00 2001
From: James Teh <jteh@mozilla.com>
Date: Wed, 9 Jun 2021 01:13:47 +0000
Subject: [PATCH] Bug 1713272 part 2: Support IAccessible2 role, uniqueID,
 windowHandle and indexInParent for RemoteAccessibles. r=morgan

Differential Revision: https://phabricator.services.mozilla.com/D116329
---
 accessible/windows/ia2/ia2Accessible.cpp | 17 +++++++++--------
 accessible/windows/ia2/ia2Accessible.h   |  2 ++
 accessible/windows/msaa/MsaaAccessible.h |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp
index f7b3bfa1230c..3bf01e944f94 100644
--- a/accessible/windows/ia2/ia2Accessible.cpp
+++ b/accessible/windows/ia2/ia2Accessible.cpp
@@ -65,6 +65,10 @@ AccessibleWrap* ia2Accessible::LocalAcc() {
   return static_cast<MsaaAccessible*>(this)->LocalAcc();
 }
 
+Accessible* ia2Accessible::Acc() {
+  return static_cast<MsaaAccessible*>(this)->Acc();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // IAccessible2
 
@@ -157,7 +161,7 @@ ia2Accessible::role(long* aRole) {
   if (!aRole) return E_INVALIDARG;
   *aRole = 0;
 
-  AccessibleWrap* acc = LocalAcc();
+  Accessible* acc = Acc();
   if (!acc) return CO_E_OBJNOTCONNECTED;
 
 #define ROLE(_geckoRole, stringRole, atkRole, macRole, macSubrole, msaaRole, \
@@ -167,7 +171,6 @@ ia2Accessible::role(long* aRole) {
     break;
 
   a11y::role geckoRole;
-  MOZ_ASSERT(!acc->IsProxy());
   geckoRole = acc->Role();
   switch (geckoRole) {
 #include "RoleMap.h"
@@ -179,9 +182,8 @@ ia2Accessible::role(long* aRole) {
 
   // Special case, if there is a ROLE_ROW inside of a ROLE_TREE_TABLE, then call
   // the IA2 role a ROLE_OUTLINEITEM.
-  MOZ_ASSERT(!acc->IsProxy());
   if (geckoRole == roles::ROW) {
-    LocalAccessible* xpParent = acc->LocalParent();
+    Accessible* xpParent = acc->Parent();
     if (xpParent && xpParent->Role() == roles::TREE_TABLE)
       *aRole = ROLE_SYSTEM_OUTLINEITEM;
   }
@@ -344,7 +346,7 @@ STDMETHODIMP
 ia2Accessible::get_uniqueID(long* aUniqueID) {
   if (!aUniqueID) return E_INVALIDARG;
 
-  AccessibleWrap* acc = LocalAcc();
+  Accessible* acc = Acc();
   *aUniqueID = MsaaAccessible::GetChildIDFor(acc);
   return S_OK;
 }
@@ -354,7 +356,7 @@ ia2Accessible::get_windowHandle(HWND* aWindowHandle) {
   if (!aWindowHandle) return E_INVALIDARG;
   *aWindowHandle = 0;
 
-  AccessibleWrap* acc = LocalAcc();
+  Accessible* acc = Acc();
   if (!acc) return CO_E_OBJNOTCONNECTED;
 
   *aWindowHandle = MsaaAccessible::GetHWNDFor(acc);
@@ -366,10 +368,9 @@ ia2Accessible::get_indexInParent(long* aIndexInParent) {
   if (!aIndexInParent) return E_INVALIDARG;
   *aIndexInParent = -1;
 
-  AccessibleWrap* acc = LocalAcc();
+  Accessible* acc = Acc();
   if (!acc) return CO_E_OBJNOTCONNECTED;
 
-  MOZ_ASSERT(!acc->IsProxy());
   *aIndexInParent = acc->IndexInParent();
 
   if (*aIndexInParent == -1) return S_FALSE;
diff --git a/accessible/windows/ia2/ia2Accessible.h b/accessible/windows/ia2/ia2Accessible.h
index 6468f5f70140..5f1c18213edd 100644
--- a/accessible/windows/ia2/ia2Accessible.h
+++ b/accessible/windows/ia2/ia2Accessible.h
@@ -17,6 +17,7 @@ class nsIPersistentProperties;
 namespace mozilla {
 namespace a11y {
 class Attribute;
+class Accessible;
 class AccessibleWrap;
 
 class ia2Accessible : public IAccessible2_3 {
@@ -119,6 +120,7 @@ class ia2Accessible : public IAccessible2_3 {
 
  private:
   AccessibleWrap* LocalAcc();
+  Accessible* Acc();
 };
 
 }  // namespace a11y
diff --git a/accessible/windows/msaa/MsaaAccessible.h b/accessible/windows/msaa/MsaaAccessible.h
index 83e9f7480e95..5766d0e09108 100644
--- a/accessible/windows/msaa/MsaaAccessible.h
+++ b/accessible/windows/msaa/MsaaAccessible.h
@@ -30,6 +30,7 @@ class MsaaAccessible : public ia2Accessible,
  public:
   static MsaaAccessible* Create(Accessible* aAcc);
 
+  Accessible* Acc() { return mAcc; }
   AccessibleWrap* LocalAcc();
 
   uint32_t GetExistingID() const { return mID; }