summaryrefslogtreecommitdiffstats
path: root/accessible
diff options
context:
space:
mode:
authorMoonchild <git-repo@palemoon.org>2019-05-04 14:26:14 +0000
committerGitHub <noreply@github.com>2019-05-04 14:26:14 +0000
commitc40086cfaf11f4f598559482a51fb6201c67bac8 (patch)
tree7cf39a54f04370c883722bf4ca2aa88e0865a938 /accessible
parentd9d9d1ed8d5fd676d9f2d0226cb087df9575cd4b (diff)
parent758663e882c49294e58a5c527f3164b6cc72c369 (diff)
downloadUXP-c40086cfaf11f4f598559482a51fb6201c67bac8.tar
UXP-c40086cfaf11f4f598559482a51fb6201c67bac8.tar.gz
UXP-c40086cfaf11f4f598559482a51fb6201c67bac8.tar.lz
UXP-c40086cfaf11f4f598559482a51fb6201c67bac8.tar.xz
UXP-c40086cfaf11f4f598559482a51fb6201c67bac8.zip
Merge pull request #1075 from adeshkp/deunify-accessible-build-2
De-unify accessibility build on Mac.
Diffstat (limited to 'accessible')
-rw-r--r--accessible/base/EventTree.cpp1
-rw-r--r--accessible/base/Logging.cpp2
-rw-r--r--accessible/base/NotificationController.cpp1
-rw-r--r--accessible/base/moz.build2
-rw-r--r--accessible/base/nsCoreUtils.cpp1
-rw-r--r--accessible/base/nsEventShell.cpp4
-rw-r--r--accessible/mac/moz.build2
-rw-r--r--accessible/mac/mozAccessible.mm36
-rw-r--r--accessible/mac/mozHTMLAccessible.mm2
-rw-r--r--accessible/mac/mozTableAccessible.mm41
-rw-r--r--accessible/mac/mozTextAccessible.mm1
-rw-r--r--accessible/xpcom/xpcAccessibleHyperText.cpp1
12 files changed, 56 insertions, 38 deletions
diff --git a/accessible/base/EventTree.cpp b/accessible/base/EventTree.cpp
index 84c4aafdd..e9867b3b5 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 afc37ef85..619af9e0a 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 3f1e5bcd3..30382e75e 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 e8e382e39..024baef4c 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 effe66be2..e0ca43ca1 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 e070acee5..00e4e9b89 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 a8f07c48b..1ead3d8f6 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 e1cdba694..07868fea6 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 6c4925589..2079a4aa6 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 a3612e5bc..6ad157b9f 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 0909cd512..1f433b802 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 b31544ac7..4b6f32e93 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"