1 files changed, 8 insertions, 13 deletions
diff --git a/accessible/windows/uia/uiaRawElmProvider.h b/accessible/windows/uia/uiaRawElmProvider.h
index 4a4aecdbe2..0e5172c805 100644
--- a/accessible/windows/uia/uiaRawElmProvider.h
+++ b/accessible/windows/uia/uiaRawElmProvider.h
@@ -8,25 +8,24 @@
 #define mozilla_a11y_uiaRawElmProvider_h__
 
 #include "objbase.h"
-#include "AccessibleWrap.h"
 #include "IUnknownImpl.h"
 #include "uiautomation.h"
 
 namespace mozilla {
 namespace a11y {
 
-class AccessibleWrap;
+class Accessible;
 
 /**
  * IRawElementProviderSimple implementation (maintains IAccessibleEx approach).
  */
-class uiaRawElmProvider final : public IAccessibleEx,
-                                public IRawElementProviderSimple {
+class uiaRawElmProvider : public IAccessibleEx,
+                          public IRawElementProviderSimple {
  public:
-  explicit uiaRawElmProvider(AccessibleWrap* aAcc) : mAcc(aAcc) {}
-
   // IUnknown
-  DECL_IUNKNOWN
+  DECL_IUNKNOWN_INHERITED
+  ULONG STDMETHODCALLTYPE AddRef() override;
+  ULONG STDMETHODCALLTYPE Release() override;
 
   // IAccessibleEx
   virtual HRESULT STDMETHODCALLTYPE GetObjectForChild(
@@ -61,12 +60,8 @@ class uiaRawElmProvider final : public IAccessibleEx,
           aRawElmProvider);
 
  private:
-  uiaRawElmProvider() = delete;
-  uiaRawElmProvider& operator=(const uiaRawElmProvider&) = delete;
-  uiaRawElmProvider(const uiaRawElmProvider&) = delete;
-
- protected:
-  RefPtr<AccessibleWrap> mAcc;
+  Accessible* Acc();
+  bool IsControl();
 };
 
 }  // namespace a11y