Bug 1694573 part 6: Remove now empty Windows HyperTextAccessibleWrap. r=eeejay

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

accessible/windows/ia2/ia2AccessibleText.cpp

@@ -11,7 +11,7 @@
 
 #include "AccessibleText_i.c"
 
-#include "HyperTextAccessibleWrap.h"
+#include "HyperTextAccessible.h"
 #include "HyperTextAccessible-inl.h"
 #include "mozilla/ClearOnShutdown.h"
 
@@ -29,17 +29,19 @@ HyperTextAccessibleBase* ia2AccessibleText::TextAcc() {
   return acc ? acc->AsHyperTextBase() : nullptr;
 }
 
-std::pair<HyperTextAccessibleWrap*, HRESULT> ia2AccessibleText::LocalTextAcc() {
+std::pair<HyperTextAccessible*, HRESULT> ia2AccessibleText::LocalTextAcc() {
   auto hyp = static_cast<ia2AccessibleHypertext*>(this);
   Accessible* acc = hyp->Acc();
   if (!acc) {
     return {nullptr, CO_E_OBJNOTCONNECTED};
   }
-  auto localAcc = static_cast<AccessibleWrap*>(acc->AsLocal());
+  LocalAccessible* localAcc = acc->AsLocal();
   if (!localAcc) {
     return {nullptr, E_NOTIMPL};
   }
-  return {static_cast<HyperTextAccessibleWrap*>(localAcc), S_OK};
+  HyperTextAccessible* hypAcc = localAcc->AsHyperText();
+  MOZ_ASSERT(hypAcc);
+  return {hypAcc, S_OK};
 }
 
 // IAccessibleText

accessible/windows/ia2/ia2AccessibleText.h

@@ -19,8 +19,8 @@ template <class T>
 class StaticRefPtr;
 
 namespace a11y {
+class HyperTextAccessible;
 class HyperTextAccessibleBase;
-class HyperTextAccessibleWrap;
 
 class ia2AccessibleText : public IAccessibleText {
  public:
@@ -146,7 +146,7 @@ class ia2AccessibleText : public IAccessibleText {
    * E_NOTIMPL: It isn't a LocalAccessible (so we can't support the method
    * being called yet).
    */
-  std::pair<HyperTextAccessibleWrap*, HRESULT> LocalTextAcc();
+  std::pair<HyperTextAccessible*, HRESULT> LocalTextAcc();
 };
 
 }  // namespace a11y

accessible/windows/msaa/HyperTextAccessibleWrap.cpp

@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "HyperTextAccessibleWrap.h"
-#include "LocalAccessible-inl.h"
-
-#include "nsEventShell.h"
-
-#include "mozilla/StaticPtr.h"
-#include "ia2AccessibleText.h"
-
-using namespace mozilla;
-using namespace mozilla::a11y;
-
-NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessibleWrap, HyperTextAccessible)

accessible/windows/msaa/HyperTextAccessibleWrap.h

@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -11,19 +9,9 @@
 #include "HyperTextAccessible.h"
 
 namespace mozilla {
-
 namespace a11y {
 
-class HyperTextAccessibleWrap : public HyperTextAccessible {
- public:
-  using HyperTextAccessible::HyperTextAccessible;
-
-  // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
-
- protected:
-  ~HyperTextAccessibleWrap() {}
-};
+typedef class HyperTextAccessible HyperTextAccessibleWrap;
 
 }  // namespace a11y
 }  // namespace mozilla

accessible/windows/msaa/moz.build

@@ -25,7 +25,6 @@ UNIFIED_SOURCES += [
     "CompatibilityUIA.cpp",
     "DocAccessibleWrap.cpp",
     "EnumVariant.cpp",
-    "HyperTextAccessibleWrap.cpp",
     "IUnknownImpl.cpp",
     "MsaaAccessible.cpp",
     "MsaaDocAccessible.cpp",