Merging upstream version 127.0.

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

3 files changed, 13 insertions, 2 deletions

diff --git a/accessible/ipc/DocAccessibleChild.h b/accessible/ipc/DocAccessibleChild.h
index 0a6164cce8..01673ba689 100644
--- a/accessible/ipc/DocAccessibleChild.h
+++ b/accessible/ipc/DocAccessibleChild.h
@@ -24,7 +24,9 @@ class AccShowEvent;
  */
 class DocAccessibleChild : public PDocAccessibleChild {
  public:
-  DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager) : mDoc(aDoc) {
+  DocAccessibleChild(DocAccessible* aDoc,
+                     mozilla::ipc::IRefCountedProtocol* aManager)
+      : mDoc(aDoc) {
     MOZ_COUNT_CTOR(DocAccessibleChild);
     SetManager(aManager);
   }
diff --git a/accessible/ipc/RemoteAccessible.cpp b/accessible/ipc/RemoteAccessible.cpp
index 772fc58776..0077750ed3 100644
--- a/accessible/ipc/RemoteAccessible.cpp
+++ b/accessible/ipc/RemoteAccessible.cpp
@@ -1329,6 +1329,13 @@ void RemoteAccessible::DOMNodeID(nsString& aID) const {
   }
 }
 
+void RemoteAccessible::DOMNodeClass(nsString& aClass) const {
+  if (mCachedFields) {
+    mCachedFields->GetAttribute(CacheKey::DOMNodeClass, aClass);
+    VERIFY_CACHE(CacheDomain::DOMNodeIDAndClass);
+  }
+}
+
 void RemoteAccessible::ScrollToPoint(uint32_t aScrollType, int32_t aX,
                                      int32_t aY) {
   Unused << mDoc->SendScrollToPoint(mID, aScrollType, aX, aY);
@@ -1551,7 +1558,7 @@ already_AddRefed<AccAttributes> RemoteAccessible::Attributes() {
     }
 
     nsString className;
-    mCachedFields->GetAttribute(CacheKey::DOMNodeClass, className);
+    DOMNodeClass(className);
     if (!className.IsEmpty()) {
       attributes->SetAttribute(nsGkAtoms::_class, std::move(className));
     }
diff --git a/accessible/ipc/RemoteAccessible.h b/accessible/ipc/RemoteAccessible.h
index 9215fd7bc5..45f41b8fb5 100644
--- a/accessible/ipc/RemoteAccessible.h
+++ b/accessible/ipc/RemoteAccessible.h
@@ -365,6 +365,8 @@ class RemoteAccessible : public Accessible, public HyperTextAccessibleBase {
 
   virtual void DOMNodeID(nsString& aID) const override;
 
+  virtual void DOMNodeClass(nsString& aClass) const override;
+
   virtual void ScrollToPoint(uint32_t aScrollType, int32_t aX,
                              int32_t aY) override;