Bug 1828378 - Make accessible/mac buildable outside of a unified build environment r=andi

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

accessible/base/Platform.h

@@ -17,6 +17,7 @@
 
 #ifdef MOZ_WIDGET_COCOA
 #  include "mozilla/a11y/Role.h"
+#  include "nsTArray.h"
 #endif
 
 #if defined(XP_WIN)

accessible/mac/CachedTextMarker.mm

@@ -11,6 +11,9 @@
 
 #include "AccAttributes.h"
 #include "nsCocoaUtils.h"
+#include "HyperTextAccessible.h"
+#include "States.h"
+#include "nsAccUtils.h"
 
 namespace mozilla {
 namespace a11y {

accessible/mac/DocAccessibleWrap.mm

@@ -7,6 +7,7 @@
 
 #include "DocAccessibleWrap.h"
 #include "DocAccessible-inl.h"
+#include "nsAccUtils.h"
 
 #import "mozAccessible.h"
 #import "MOXTextMarkerDelegate.h"

accessible/mac/GeckoTextMarker.mm

@@ -9,6 +9,8 @@
 
 #import "MacUtils.h"
 
+#include "nsAccUtils.h"
+#include "DocAccessible.h"
 #include "DocAccessibleParent.h"
 #include "mozilla/StaticPrefs_accessibility.h"
 

accessible/mac/HyperTextAccessibleWrap.mm

@@ -12,6 +12,7 @@
 #include "nsAccUtils.h"
 #include "nsFrameSelection.h"
 #include "TextLeafRange.h"
+#include "TextRange.h"
 #include "TreeWalker.h"
 
 using namespace mozilla;

accessible/mac/LegacyTextMarker.mm

@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #import "LegacyTextMarker.h"
+#import "MacUtils.h"
 
 #include "DocAccessible.h"
 #include "DocAccessibleParent.h"

accessible/mac/MOXAccessibleBase.mm

@@ -12,7 +12,9 @@
 #include "nsObjCExceptions.h"
 #include "xpcAccessibleMacInterface.h"
 #include "mozilla/Logging.h"
+#include "gfxPlatform.h"
 
+using namespace mozilla;
 using namespace mozilla::a11y;
 
 #undef LOG

accessible/mac/MOXSearchInfo.mm

@@ -12,6 +12,7 @@
 #include "nsCocoaUtils.h"
 #include "DocAccessibleParent.h"
 #include "mozilla/StaticPrefs_accessibility.h"
+#include "mozilla/a11y/DocAccessiblePlatformExtParent.h"
 
 using namespace mozilla::a11y;
 
@@ -128,7 +129,7 @@ using namespace mozilla::a11y;
   // In that case, we should act as if no AXSearchText was given.
   // When caching is enabled we filter the tree in the pivot rule
   // and don't need to apply the post search filter.
-  return !StaticPrefs::accessibility_cache_enabled_AtStartup() &&
+  return !mozilla::StaticPrefs::accessibility_cache_enabled_AtStartup() &&
          !!mSearchText && [mSearchText length] > 0;
 }
 
@@ -179,11 +180,12 @@ using namespace mozilla::a11y;
       // of the current ipcDoc.
       nsTArray<uint64_t> matchIds;
       MOZ_ASSERT(
-          !StaticPrefs::accessibility_cache_enabled_AtStartup(),
+          !mozilla::StaticPrefs::accessibility_cache_enabled_AtStartup(),
           "Should call SendApplyPostSearchFilter when cache is enabled!");
-      Unused << ipcDoc->GetPlatformExtension()->SendApplyPostSearchFilter(
-          accIds, mResultLimit, EWhichPostFilter::eContainsText, searchText,
-          &matchIds);
+      mozilla::Unused
+          << ipcDoc->GetPlatformExtension()->SendApplyPostSearchFilter(
+                 accIds, mResultLimit, EWhichPostFilter::eContainsText,
+                 searchText, &matchIds);
       for (size_t i = 0; i < matchIds.Length(); i++) {
         if (RemoteAccessible* postMatch =
                 ipcDoc->GetAccessible(matchIds.ElementAt(i))) {

accessible/mac/MOXWebAreaAccessible.mm

@@ -8,9 +8,11 @@
 #import "MOXWebAreaAccessible.h"
 
 #import "MOXSearchInfo.h"
+#import "MacUtils.h"
 
 #include "nsAccUtils.h"
 #include "nsCocoaUtils.h"
+#include "DocAccessible.h"
 #include "DocAccessibleParent.h"
 
 using namespace mozilla::a11y;

accessible/mac/MacUtils.h

@@ -9,6 +9,8 @@
 #define _MacUtils_H_
 
 #include "nsStringFwd.h"
+#include "mozAccessible.h"
+#include "MOXAccessibleBase.h"
 
 @class NSString;
 @class mozAccessible;

accessible/mac/MacUtils.mm

@@ -8,6 +8,8 @@
 #import "MacUtils.h"
 
 #include "LocalAccessible.h"
+#include "DocAccessible.h"
+#include "DocAccessibleParent.h"
 #include "nsCocoaUtils.h"
 #include "mozilla/a11y/PDocAccessible.h"
 

accessible/mac/Platform.mm

@@ -13,9 +13,11 @@
 #include "RemoteAccessible.h"
 #include "DocAccessibleParent.h"
 #include "mozTableAccessible.h"
+#include "mozTextAccessible.h"
 #include "MOXWebAreaAccessible.h"
 
 #include "nsAppShell.h"
+#include "nsCocoaUtils.h"
 #include "mozilla/Telemetry.h"
 
 // Available from 10.13 onwards; test availability at runtime before using
@@ -229,7 +231,8 @@ void ProxyRoleChangedEvent(RemoteAccessible* aTarget, const a11y::role& aRole,
       }
 
 #if defined(MOZ_TELEMETRY_REPORTING)
-      Telemetry::ScalarSet(Telemetry::ScalarID::A11Y_INSTANTIATORS, client);
+      mozilla::Telemetry::ScalarSet(
+          mozilla::Telemetry::ScalarID::A11Y_INSTANTIATORS, client);
 #endif  // defined(MOZ_TELEMETRY_REPORTING)
       CrashReporter::AnnotateCrashReport(
           CrashReporter::Annotation::AccessibilityClient,

accessible/mac/RotorRules.mm

@@ -9,9 +9,12 @@
 
 #include "nsCocoaUtils.h"
 #include "DocAccessibleParent.h"
+#include "nsIAccessiblePivot.h"
+#include "nsAccUtils.h"
 
 #include "mozilla/StaticPrefs_accessibility.h"
 
+using namespace mozilla;
 using namespace mozilla::a11y;
 
 // Generic Rotor Rule

accessible/mac/moz.build

@@ -73,5 +73,3 @@ GeneratedFile(
 FINAL_LIBRARY = "xul"
 
 include("/ipc/chromium/chromium-config.mozbuild")
-
-REQUIRES_UNIFIED_BUILD = True

accessible/mac/mozAccessible.h

@@ -5,6 +5,9 @@
  * 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/. */
 
+#ifndef _MozAccessible_H_
+#define _MozAccessible_H_
+
 #include "AccessibleWrap.h"
 #include "RemoteAccessible.h"
 
@@ -282,3 +285,5 @@ enum CheckedState {
 - (BOOL)isExpired;
 
 @end
+
+#endif

accessible/mac/mozTableAccessible.mm

@@ -16,6 +16,7 @@
 #include "mozilla/StaticPrefs_accessibility.h"
 #include "XULTreeAccessible.h"
 #include "Pivot.h"
+#include "nsAccUtils.h"
 #include "Relation.h"
 
 using namespace mozilla;