Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 1 deletions

diff --git a/accessible/windows/ia2/ia2AccessibleTable.cpp b/accessible/windows/ia2/ia2AccessibleTable.cpp
index 50bdc79967..9ce94e8348 100644
--- a/accessible/windows/ia2/ia2AccessibleTable.cpp
+++ b/accessible/windows/ia2/ia2AccessibleTable.cpp
@@ -21,7 +21,7 @@
 using namespace mozilla::a11y;
 
 TableAccessible* ia2AccessibleTable::TableAcc() {
-  Accessible* acc = Acc();
+  Accessible* acc = MsaaAccessible::Acc();
   return acc ? acc->AsTable() : nullptr;
 }
 
@@ -46,6 +46,18 @@ ia2AccessibleTable::QueryInterface(REFIID iid, void** ppv) {
     return S_OK;
   }
 
+  if (IID_IGridProvider == iid) {
+    *ppv = static_cast<IGridProvider*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
+    return S_OK;
+  }
+
+  if (IID_ITableProvider == iid) {
+    *ppv = static_cast<ITableProvider*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
+    return S_OK;
+  }
+
   return ia2AccessibleHypertext::QueryInterface(iid, ppv);
 }