Bug 1821963 part 2: Remove COM registration supporting the old access…

…ibility architecture based on content process COM proxies. r=nlapre,bobowen Differential Revision: https://phabricator.services.mozilla.com/D177962
dothq · May 22, 2023 · 13afc4e · 13afc4e
1 parent fb07ae8
commit 13afc4e
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 823 deletions.
diff --git a/accessible/ipc/IPCTypes.h b/accessible/ipc/IPCTypes.h
@@ -164,43 +164,6 @@ typedef uint32_t role;
  * define types used by PDocAccessible differently depending on platform.
  */
 
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-
-// So that we don't include a bunch of other Windows junk.
-#  if !defined(COM_NO_WINDOWS_H)
-#    define COM_NO_WINDOWS_H
-#  endif  // !defined(COM_NO_WINDOWS_H)
-
-// COM headers pull in MSXML which conflicts with our own XMLDocument class.
-// This define excludes those conflicting definitions.
-#  if !defined(__XMLDocument_FWD_DEFINED__)
-#    define __XMLDocument_FWD_DEFINED__
-#  endif  // !defined(__XMLDocument_FWD_DEFINED__)
-
-#  include <combaseapi.h>
-
-#  include "mozilla/a11y/COMPtrTypes.h"
-
-// This define in rpcndr.h messes up our code, so we must undefine it after
-// COMPtrTypes.h has been included.
-#  if defined(small)
-#    undef small
-#  endif  // defined(small)
-
-#else
-
-namespace mozilla {
-namespace a11y {
-
-typedef uint32_t IAccessibleHolder;
-typedef uint32_t IDispatchHolder;
-typedef uint32_t IHandlerControlHolder;
-
-}  // namespace a11y
-}  // namespace mozilla
-
-#endif  // defined(XP_WIN) && defined(ACCESSIBILITY)
-
 #if defined(MOZ_WIDGET_COCOA)
 #  if defined(ACCESSIBILITY)
 #    include "mozilla/a11y/PlatformExtTypes.h"

diff --git a/accessible/ipc/win/COMPtrTypes.cpp b/accessible/ipc/win/COMPtrTypes.cpp
diff --git a/accessible/ipc/win/COMPtrTypes.h b/accessible/ipc/win/COMPtrTypes.h
diff --git a/accessible/ipc/win/DocAccessibleChild.cpp b/accessible/ipc/win/DocAccessibleChild.cpp
@@ -7,22 +7,13 @@
 #include "DocAccessibleChild.h"
 
 #include "LocalAccessible-inl.h"
-#include "mozilla/a11y/PlatformChild.h"
-#include "mozilla/ClearOnShutdown.h"
 
 namespace mozilla {
 namespace a11y {
 
-static StaticAutoPtr<PlatformChild> sPlatformChild;
-
 DocAccessibleChild::DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager)
     : DocAccessibleChildBase(aDoc) {
   MOZ_COUNT_CTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
-  if (!sPlatformChild) {
-    sPlatformChild = new PlatformChild();
-    ClearOnShutdown(&sPlatformChild, ShutdownPhase::XPCOMShutdown);
-  }
-
   SetManager(aManager);
 }
 

diff --git a/accessible/ipc/win/HandlerProvider.cpp b/accessible/ipc/win/HandlerProvider.cpp
@@ -13,6 +13,7 @@
 #include "Accessible2_3.h"
 #include "AccessibleApplication.h"
 #include "AccessibleDocument.h"
+#include "AccessibleDocument_i.c"
 #include "AccessibleEditableText.h"
 #include "AccessibleImage.h"
 #include "AccessibleRelation.h"

diff --git a/accessible/ipc/win/PlatformChild.cpp b/accessible/ipc/win/PlatformChild.cpp
diff --git a/accessible/ipc/win/PlatformChild.h b/accessible/ipc/win/PlatformChild.h
diff --git a/accessible/ipc/win/moz.build b/accessible/ipc/win/moz.build
@@ -14,19 +14,15 @@ if CONFIG["ACCESSIBILITY"]:
     IPDL_SOURCES += ["PDocAccessible.ipdl"]
 
     EXPORTS.mozilla.a11y += [
-        "COMPtrTypes.h",
         "DocAccessibleChild.h",
         "HandlerProvider.h",
-        "PlatformChild.h",
         "RemoteAccessible.h",
     ]
 
     SOURCES += [
         "!./handler/HandlerData_c.c",
-        "COMPtrTypes.cpp",
         "DocAccessibleChild.cpp",
         "HandlerProvider.cpp",
-        "PlatformChild.cpp",
     ]
 
     # Give some symbols a unique name in each translation unit, to avoid

diff --git a/accessible/windows/ia2/ia2AccessibleHypertext.cpp b/accessible/windows/ia2/ia2AccessibleHypertext.cpp
@@ -8,6 +8,7 @@
 #include "ia2AccessibleHypertext.h"
 
 #include "AccessibleHypertext_i.c"
+#include "AccessibleHypertext2_i.c"
 
 #include "mozilla/a11y/HyperTextAccessibleBase.h"