De-unify accessibility build on Mac.

Also fixes Linux build bustage with accessibility enabled.

12 files changed, 56 insertions, 38 deletions

diff --git a/accessible/base/EventTree.cpp b/accessible/base/EventTree.cpp
index 84c4aafdd6..e9867b3b58 100644
--- a/accessible/base/EventTree.cpp
+++ b/accessible/base/EventTree.cpp
@@ -8,6 +8,7 @@
 #include "Accessible-inl.h"
 #include "nsEventShell.h"
 #include "DocAccessible.h"
+#include "DocAccessible-inl.h"
 #include "EmbeddedObjCollector.h"
 #include "NotificationController.h"
 #ifdef A11Y_LOG
diff --git a/accessible/base/Logging.cpp b/accessible/base/Logging.cpp
index afc37ef85e..619af9e0a5 100644
--- a/accessible/base/Logging.cpp
+++ b/accessible/base/Logging.cpp
@@ -9,6 +9,7 @@
 #include "Accessible-inl.h"
 #include "AccEvent.h"
 #include "DocAccessible.h"
+#include "DocAccessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsCoreUtils.h"
 #include "OuterDocAccessible.h"
@@ -23,6 +24,7 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIURI.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLBodyElement.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
diff --git a/accessible/base/NotificationController.cpp b/accessible/base/NotificationController.cpp
index 3f1e5bcd3e..30382e75e3 100644
--- a/accessible/base/NotificationController.cpp
+++ b/accessible/base/NotificationController.cpp
@@ -17,6 +17,7 @@
 
 using namespace mozilla;
 using namespace mozilla::a11y;
+using namespace mozilla::dom;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationCollector
diff --git a/accessible/base/moz.build b/accessible/base/moz.build
index e8e382e39b..024baef4c9 100644
--- a/accessible/base/moz.build
+++ b/accessible/base/moz.build
@@ -55,7 +55,7 @@ SOURCES += [
 ]
 
 if CONFIG['A11Y_LOG']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'Logging.cpp',
     ]
 
diff --git a/accessible/base/nsCoreUtils.cpp b/accessible/base/nsCoreUtils.cpp
index effe66be22..e0ca43ca17 100644
--- a/accessible/base/nsCoreUtils.cpp
+++ b/accessible/base/nsCoreUtils.cpp
@@ -9,6 +9,7 @@
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeOwner.h"
+#include "nsIContentInlines.h"
 #include "nsIDocument.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
diff --git a/accessible/base/nsEventShell.cpp b/accessible/base/nsEventShell.cpp
index e070acee5c..00e4e9b896 100644
--- a/accessible/base/nsEventShell.cpp
+++ b/accessible/base/nsEventShell.cpp
@@ -9,6 +9,10 @@
 
 #include "mozilla/StaticPtr.h"
 
+#ifdef A11Y_LOG
+#include "Logging.h"
+#endif
+
 using namespace mozilla;
 using namespace mozilla::a11y;
 
diff --git a/accessible/mac/moz.build b/accessible/mac/moz.build
index a8f07c48b2..1ead3d8f68 100644
--- a/accessible/mac/moz.build
+++ b/accessible/mac/moz.build
@@ -13,7 +13,7 @@ EXPORTS.mozilla.a11y += [
     'HyperTextAccessibleWrap.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AccessibleWrap.mm',
     'DocAccessibleWrap.mm',
     'MacUtils.mm',
diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm
index e1cdba6948..07868fea67 100644
--- a/accessible/mac/mozAccessible.mm
+++ b/accessible/mac/mozAccessible.mm
@@ -49,42 +49,6 @@ using namespace mozilla::a11y;
 // - NSAccessibilityMathPrescriptsAttribute @"AXMathPrescripts"
 // - NSAccessibilityMathPostscriptsAttribute @"AXMathPostscripts"
 
-// convert an array of Gecko accessibles to an NSArray of native accessibles
-static inline NSMutableArray*
-ConvertToNSArray(nsTArray<Accessible*>& aArray)
-{
-  NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
-
-  // iterate through the list, and get each native accessible.
-  size_t totalCount = aArray.Length();
-  for (size_t i = 0; i < totalCount; i++) {
-    Accessible* curAccessible = aArray.ElementAt(i);
-    mozAccessible* curNative = GetNativeFromGeckoAccessible(curAccessible);
-    if (curNative)
-      [nativeArray addObject:GetObjectOrRepresentedView(curNative)];
-  }
-
-  return nativeArray;
-}
-
-// convert an array of Gecko proxy accessibles to an NSArray of native accessibles
-static inline NSMutableArray*
-ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
-{
-  NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
-
-  // iterate through the list, and get each native accessible.
-  size_t totalCount = aArray.Length();
-  for (size_t i = 0; i < totalCount; i++) {
-    ProxyAccessible* curAccessible = aArray.ElementAt(i);
-    mozAccessible* curNative = GetNativeFromProxy(curAccessible);
-    if (curNative)
-      [nativeArray addObject:GetObjectOrRepresentedView(curNative)];
-  }
-
-  return nativeArray;
-}
-
 #pragma mark -
 
 @implementation mozAccessible
diff --git a/accessible/mac/mozHTMLAccessible.mm b/accessible/mac/mozHTMLAccessible.mm
index 6c49255897..2079a4aa6b 100644
--- a/accessible/mac/mozHTMLAccessible.mm
+++ b/accessible/mac/mozHTMLAccessible.mm
@@ -12,6 +12,8 @@
 
 #import "nsCocoaUtils.h"
 
+using namespace mozilla::a11y;
+
 @implementation mozHeadingAccessible
 
 - (NSString*)title
diff --git a/accessible/mac/mozTableAccessible.mm b/accessible/mac/mozTableAccessible.mm
index a3612e5bc3..6ad157b9f0 100644
--- a/accessible/mac/mozTableAccessible.mm
+++ b/accessible/mac/mozTableAccessible.mm
@@ -5,9 +5,50 @@
  * 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/. */
 
+#import "Accessible-inl.h"
 #import "mozTableAccessible.h"
+#import "TableAccessible.h"
+#import "TableCellAccessible.h"
 #import "nsCocoaUtils.h"
 
+using namespace mozilla::a11y;
+
+// convert an array of Gecko accessibles to an NSArray of native accessibles
+static inline NSMutableArray*
+ConvertToNSArray(nsTArray<Accessible*>& aArray)
+{
+  NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
+
+  // iterate through the list, and get each native accessible.
+  size_t totalCount = aArray.Length();
+  for (size_t i = 0; i < totalCount; i++) {
+    Accessible* curAccessible = aArray.ElementAt(i);
+    mozAccessible* curNative = GetNativeFromGeckoAccessible(curAccessible);
+    if (curNative)
+      [nativeArray addObject:GetObjectOrRepresentedView(curNative)];
+  }
+
+  return nativeArray;
+}
+
+// convert an array of Gecko proxy accessibles to an NSArray of native accessibles
+static inline NSMutableArray*
+ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
+{
+  NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
+
+  // iterate through the list, and get each native accessible.
+  size_t totalCount = aArray.Length();
+  for (size_t i = 0; i < totalCount; i++) {
+    ProxyAccessible* curAccessible = aArray.ElementAt(i);
+    mozAccessible* curNative = GetNativeFromProxy(curAccessible);
+    if (curNative)
+      [nativeArray addObject:GetObjectOrRepresentedView(curNative)];
+  }
+
+  return nativeArray;
+}
+
 @implementation mozTablePartAccessible
 - (BOOL)isLayoutTablePart;
 {
diff --git a/accessible/mac/mozTextAccessible.mm b/accessible/mac/mozTextAccessible.mm
index 0909cd5129..1f433b802e 100644
--- a/accessible/mac/mozTextAccessible.mm
+++ b/accessible/mac/mozTextAccessible.mm
@@ -12,6 +12,7 @@
 
 #import "mozTextAccessible.h"
 
+using namespace mozilla;
 using namespace mozilla::a11y;
 
 inline bool
diff --git a/accessible/xpcom/xpcAccessibleHyperText.cpp b/accessible/xpcom/xpcAccessibleHyperText.cpp
index b31544ac7f..4b6f32e932 100644
--- a/accessible/xpcom/xpcAccessibleHyperText.cpp
+++ b/accessible/xpcom/xpcAccessibleHyperText.cpp
@@ -7,6 +7,7 @@
 #include "xpcAccessibleHyperText.h"
 
 #include "Accessible-inl.h"
+#include "mozilla/a11y/DocAccessibleParent.h"
 #include "HyperTextAccessible-inl.h"
 #include "TextRange.h"
 #include "xpcAccessibleDocument.h"