diff options
Diffstat (limited to 'accessible')
43 files changed, 107 insertions, 67 deletions
diff --git a/accessible/aom/moz.build b/accessible/aom/moz.build index 700081215..3d7575b0c 100644 --- a/accessible/aom/moz.build +++ b/accessible/aom/moz.build @@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [ 'AccessibleNode.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AccessibleNode.cpp', ] diff --git a/accessible/atk/Platform.cpp b/accessible/atk/Platform.cpp index e64084f5a..0ee3a3d97 100644 --- a/accessible/atk/Platform.cpp +++ b/accessible/atk/Platform.cpp @@ -60,11 +60,7 @@ struct GnomeAccessibilityModule }; static GnomeAccessibilityModule sAtkBridge = { -#ifdef AIX - "libatk-bridge.a(libatk-bridge.so.0)", nullptr, -#else "libatk-bridge.so", nullptr, -#endif "gnome_accessibility_module_init", nullptr, "gnome_accessibility_module_shutdown", nullptr }; diff --git a/accessible/base/AccessibleOrProxy.cpp b/accessible/base/AccessibleOrProxy.cpp index 77fb44a11..e43dd3264 100644 --- a/accessible/base/AccessibleOrProxy.cpp +++ b/accessible/base/AccessibleOrProxy.cpp @@ -5,6 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccessibleOrProxy.h" +#include "DocAccessible.h" + +using namespace mozilla::a11y; AccessibleOrProxy AccessibleOrProxy::Parent() const diff --git a/accessible/base/EventTree.cpp b/accessible/base/EventTree.cpp index cd4a07ba8..e9867b3b5 100644 --- a/accessible/base/EventTree.cpp +++ b/accessible/base/EventTree.cpp @@ -8,6 +8,9 @@ #include "Accessible-inl.h" #include "nsEventShell.h" #include "DocAccessible.h" +#include "DocAccessible-inl.h" +#include "EmbeddedObjCollector.h" +#include "NotificationController.h" #ifdef A11Y_LOG #include "Logging.h" #endif diff --git a/accessible/base/EventTree.h b/accessible/base/EventTree.h index 932ceaf4e..cdb5e8911 100644 --- a/accessible/base/EventTree.h +++ b/accessible/base/EventTree.h @@ -8,6 +8,7 @@ #include "AccEvent.h" #include "Accessible.h" +#include "DocAccessible.h" #include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" diff --git a/accessible/base/FocusManager.h b/accessible/base/FocusManager.h index 633f9ccb2..c32101372 100644 --- a/accessible/base/FocusManager.h +++ b/accessible/base/FocusManager.h @@ -5,6 +5,8 @@ #ifndef mozilla_a11y_FocusManager_h_ #define mozilla_a11y_FocusManager_h_ +#include "mozilla/RefPtr.h" + class nsINode; class nsIDocument; class nsISupports; 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 3545ce6c1..30382e75e 100644 --- a/accessible/base/NotificationController.cpp +++ b/accessible/base/NotificationController.cpp @@ -7,6 +7,7 @@ #include "DocAccessible-inl.h" #include "DocAccessibleChild.h" +#include "nsEventShell.h" #include "TextLeafAccessible.h" #include "TextUpdater.h" @@ -16,6 +17,7 @@ using namespace mozilla; using namespace mozilla::a11y; +using namespace mozilla::dom; //////////////////////////////////////////////////////////////////////////////// // NotificationCollector diff --git a/accessible/base/TreeWalker.cpp b/accessible/base/TreeWalker.cpp index 8c04b5d6f..a5353510f 100644 --- a/accessible/base/TreeWalker.cpp +++ b/accessible/base/TreeWalker.cpp @@ -6,6 +6,7 @@ #include "TreeWalker.h" #include "Accessible.h" +#include "Accessible-inl.h" #include "AccIterator.h" #include "nsAccessibilityService.h" #include "DocAccessible.h" diff --git a/accessible/base/moz.build b/accessible/base/moz.build index dcccc4b54..024baef4c 100644 --- a/accessible/base/moz.build +++ b/accessible/base/moz.build @@ -25,7 +25,7 @@ if CONFIG['MOZ_DEBUG']: 'Logging.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AccessibleOrProxy.cpp', 'AccEvent.cpp', 'AccGroupInfo.cpp', @@ -55,7 +55,7 @@ UNIFIED_SOURCES += [ ] if CONFIG['A11Y_LOG']: - UNIFIED_SOURCES += [ + SOURCES += [ 'Logging.cpp', ] diff --git a/accessible/base/nsCoreUtils.cpp b/accessible/base/nsCoreUtils.cpp index 89823b223..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" @@ -23,6 +24,7 @@ #include "nsISelectionPrivate.h" #include "nsISelectionController.h" #include "nsISimpleEnumerator.h" +#include "nsXBLPrototypeBinding.h" #include "mozilla/dom/TouchEvent.h" #include "mozilla/EventListenerManager.h" #include "mozilla/EventStateManager.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/base/nsTextEquivUtils.cpp b/accessible/base/nsTextEquivUtils.cpp index bdf14d097..8f3f121ed 100644 --- a/accessible/base/nsTextEquivUtils.cpp +++ b/accessible/base/nsTextEquivUtils.cpp @@ -10,9 +10,11 @@ #include "Accessible-inl.h" #include "AccIterator.h" #include "nsCoreUtils.h" +#include "nsStyleConsts.h" #include "nsIDOMXULLabeledControlEl.h" using namespace mozilla::a11y; +using namespace mozilla; /** * The accessible for which we are computing a text equivalent. It is useful diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp index 7ff2f8283..505a4f68e 100644 --- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -47,6 +47,7 @@ #include "nsDeckFrame.h" #include "nsLayoutUtils.h" +#include "nsIPersistentProperties2.h" #include "nsIPresShell.h" #include "nsIStringBundle.h" #include "nsPresContext.h" diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp index 059c27372..85f71db00 100644 --- a/accessible/generic/HyperTextAccessible.cpp +++ b/accessible/generic/HyperTextAccessible.cpp @@ -11,6 +11,7 @@ #include "nsIAccessibleTypes.h" #include "DocAccessible.h" #include "HTMLListAccessible.h" +#include "Relation.h" #include "Role.h" #include "States.h" #include "TextAttrs.h" diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp index 5817f2da9..8ca9b8c9c 100644 --- a/accessible/generic/RootAccessible.cpp +++ b/accessible/generic/RootAccessible.cpp @@ -27,8 +27,10 @@ #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeOwner.h" +#include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/dom/Event.h" #include "mozilla/dom/EventTarget.h" +#include "mozilla/dom/TabParent.h" #include "nsIDOMCustomEvent.h" #include "nsIDOMXULMultSelectCntrlEl.h" #include "nsIDocument.h" diff --git a/accessible/generic/moz.build b/accessible/generic/moz.build index a9e97acf0..d64e22a64 100644 --- a/accessible/generic/moz.build +++ b/accessible/generic/moz.build @@ -10,7 +10,7 @@ EXPORTS.mozilla.a11y += [ 'HyperTextAccessible.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Accessible.cpp', 'ApplicationAccessible.cpp', 'ARIAGridAccessible.cpp', diff --git a/accessible/html/HTMLListAccessible.cpp b/accessible/html/HTMLListAccessible.cpp index d5de25718..9e00a648a 100644 --- a/accessible/html/HTMLListAccessible.cpp +++ b/accessible/html/HTMLListAccessible.cpp @@ -10,6 +10,7 @@ #include "nsAccUtils.h" #include "Role.h" #include "States.h" +#include "EventTree.h" #include "nsBlockFrame.h" #include "nsBulletFrame.h" diff --git a/accessible/html/moz.build b/accessible/html/moz.build index 8d92332cd..6b2a06851 100644 --- a/accessible/html/moz.build +++ b/accessible/html/moz.build @@ -4,7 +4,7 @@ # 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/. -UNIFIED_SOURCES += [ +SOURCES += [ 'HTMLCanvasAccessible.cpp', 'HTMLElementAccessibles.cpp', 'HTMLFormControlAccessible.cpp', diff --git a/accessible/ipc/moz.build b/accessible/ipc/moz.build index bb0632cd2..f90844eb1 100644 --- a/accessible/ipc/moz.build +++ b/accessible/ipc/moz.build @@ -44,7 +44,7 @@ if CONFIG['ACCESSIBILITY']: 'ProxyAccessibleShared.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ 'DocAccessibleChildBase.cpp', 'DocAccessibleParent.cpp', 'ProxyAccessibleBase.cpp', 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/tests/mochitest/common.js b/accessible/tests/mochitest/common.js index 1e48fa067..b3f83ea84 100644 --- a/accessible/tests/mochitest/common.js +++ b/accessible/tests/mochitest/common.js @@ -59,7 +59,6 @@ const nsIPropertyElement = Components.interfaces.nsIPropertyElement; const MAC = (navigator.platform.indexOf("Mac") != -1); const LINUX = (navigator.platform.indexOf("Linux") != -1); -const SOLARIS = (navigator.platform.indexOf("SunOS") != -1); const WIN = (navigator.platform.indexOf("Win") != -1); //////////////////////////////////////////////////////////////////////////////// diff --git a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html index 58763e437..e23eb37bc 100644 --- a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html +++ b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html @@ -32,7 +32,7 @@ // nsIAccessible::name var applicationName = ""; - if (LINUX || SOLARIS) { + if (LINUX) { applicationName = appInfo.name; } else { try { diff --git a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul index 5b31e0136..916b815eb 100644 --- a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul +++ b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul @@ -130,7 +130,7 @@ */ function getMenuTree1() { - if (LINUX || SOLARIS) { + if (LINUX) { var tree = { role: ROLE_MENUPOPUP, children: [ @@ -190,7 +190,7 @@ function getMenuTree2() { var tree = getMenuTree1(); - if (LINUX || SOLARIS) { + if (LINUX) { var submenuTree = { name: "item2.0", @@ -232,7 +232,7 @@ children: [] }; - if (LINUX || SOLARIS) + if (LINUX) tree.children[2].children[0].children.push(subsubmenuTree); else tree.children[2].children[0].children[0].children[0].children.push(subsubmenuTree); diff --git a/accessible/tests/mochitest/treeupdate/test_menu.xul b/accessible/tests/mochitest/treeupdate/test_menu.xul index abdea217e..d62ac8c5d 100644 --- a/accessible/tests/mochitest/treeupdate/test_menu.xul +++ b/accessible/tests/mochitest/treeupdate/test_menu.xul @@ -32,7 +32,7 @@ this.invoke = function openMenu_invoke() { var tree; - if (LINUX || SOLARIS) { + if (LINUX) { tree = { PARENT_MENUITEM: [ ] }; @@ -51,7 +51,7 @@ this.finalCheck = function openMenu_finalCheck() { var tree; - if (LINUX || SOLARIS) { + if (LINUX) { tree = { PARENT_MENUITEM: [ { MENUITEM: [ ] }, diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp index 97cd0d788..ba56235ea 100644 --- a/accessible/windows/ia2/ia2Accessible.cpp +++ b/accessible/windows/ia2/ia2Accessible.cpp @@ -6,6 +6,9 @@ #include "AccessibleWrap.h" +#include "Accessible.h" +#include "Accessible-inl.h" + #include "Accessible2_i.c" #include "Accessible2_2_i.c" #include "Accessible2_3_i.c" diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp index 86b3abdf6..451ac4f9b 100644 --- a/accessible/windows/ia2/ia2AccessibleText.cpp +++ b/accessible/windows/ia2/ia2AccessibleText.cpp @@ -15,6 +15,7 @@ #include "ProxyWrappers.h" #include "mozilla/ClearOnShutdown.h" +using namespace mozilla; using namespace mozilla::a11y; StaticRefPtr<HyperTextAccessibleWrap> ia2AccessibleText::sLastTextChangeAcc; diff --git a/accessible/windows/ia2/ia2AccessibleText.h b/accessible/windows/ia2/ia2AccessibleText.h index a513e44a2..26382df76 100644 --- a/accessible/windows/ia2/ia2AccessibleText.h +++ b/accessible/windows/ia2/ia2AccessibleText.h @@ -11,6 +11,8 @@ #include "nsIAccessibleText.h" #include "AccessibleText.h" +#include "nsString.h" +#include "mozilla/StaticPtr.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/moz.build b/accessible/windows/ia2/moz.build index 443e87663..dc763bcfd 100644 --- a/accessible/windows/ia2/moz.build +++ b/accessible/windows/ia2/moz.build @@ -15,7 +15,7 @@ EXPORTS += [ 'ia2AccessibleValue.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ia2Accessible.cpp', 'ia2AccessibleAction.cpp', 'ia2AccessibleComponent.cpp', diff --git a/accessible/windows/msaa/MsaaIdGenerator.cpp b/accessible/windows/msaa/MsaaIdGenerator.cpp index 5f4b333fa..3cc2e7aaf 100644 --- a/accessible/windows/msaa/MsaaIdGenerator.cpp +++ b/accessible/windows/msaa/MsaaIdGenerator.cpp @@ -83,7 +83,7 @@ private: } // namespace detail -constexpr MsaaIdGenerator::MsaaIdGenerator() +MsaaIdGenerator::MsaaIdGenerator() : mIDSet(kNumUniqueIDBits) {} diff --git a/accessible/windows/msaa/MsaaIdGenerator.h b/accessible/windows/msaa/MsaaIdGenerator.h index b845e8473..db667b51a 100644 --- a/accessible/windows/msaa/MsaaIdGenerator.h +++ b/accessible/windows/msaa/MsaaIdGenerator.h @@ -30,7 +30,7 @@ class AccessibleWrap; class MsaaIdGenerator { public: - constexpr MsaaIdGenerator(); + MsaaIdGenerator(); uint32_t GetID(); void ReleaseID(AccessibleWrap* aAccWrap); diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp index dc6acd3ad..fb6a7d862 100644 --- a/accessible/windows/msaa/Platform.cpp +++ b/accessible/windows/msaa/Platform.cpp @@ -6,6 +6,9 @@ #include "Platform.h" +#include "Accessible.h" +#include "Accessible-inl.h" + #include "AccEvent.h" #include "Compatibility.h" #include "HyperTextAccessibleWrap.h" diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build index 54c8c6686..799f7930f 100644 --- a/accessible/windows/msaa/moz.build +++ b/accessible/windows/msaa/moz.build @@ -16,7 +16,7 @@ EXPORTS.mozilla.a11y += [ 'MsaaIdGenerator.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AccessibleWrap.cpp', 'ApplicationAccessibleWrap.cpp', 'ARIAGridAccessibleWrap.cpp', @@ -32,16 +32,12 @@ UNIFIED_SOURCES += [ 'nsWinUtils.cpp', 'Platform.cpp', 'RootAccessibleWrap.cpp', - 'TextLeafAccessibleWrap.cpp', -] - -# This file cannot be built in unified mode because it includes ISimpleDOMNode_i.c. -SOURCES += [ 'ServiceProvider.cpp', + 'TextLeafAccessibleWrap.cpp', ] if CONFIG['MOZ_XUL']: - UNIFIED_SOURCES += [ + SOURCES += [ 'XULListboxAccessibleWrap.cpp', 'XULMenuAccessibleWrap.cpp', 'XULTreeGridAccessibleWrap.cpp', diff --git a/accessible/windows/sdn/moz.build b/accessible/windows/sdn/moz.build index ae0d5e20d..474612bc3 100644 --- a/accessible/windows/sdn/moz.build +++ b/accessible/windows/sdn/moz.build @@ -4,7 +4,7 @@ # 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/. -UNIFIED_SOURCES += [ +SOURCES += [ 'sdnAccessible.cpp', 'sdnDocAccessible.cpp', 'sdnTextAccessible.cpp', diff --git a/accessible/xpcom/moz.build b/accessible/xpcom/moz.build index ec54a197a..7d7715ec6 100644 --- a/accessible/xpcom/moz.build +++ b/accessible/xpcom/moz.build @@ -4,7 +4,7 @@ # 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/. -UNIFIED_SOURCES += [ +SOURCES += [ 'nsAccessibleRelation.cpp', 'xpcAccessibilityService.cpp', 'xpcAccessible.cpp', diff --git a/accessible/xpcom/xpcAccessibilityService.cpp b/accessible/xpcom/xpcAccessibilityService.cpp index 97c0d0e72..79040afbf 100644 --- a/accessible/xpcom/xpcAccessibilityService.cpp +++ b/accessible/xpcom/xpcAccessibilityService.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "xpcAccessibilityService.h" +#include "xpcAccessibleDocument.h" #include "nsAccessiblePivot.h" #include "nsAccessibilityService.h" diff --git a/accessible/xpcom/xpcAccessibilityService.h b/accessible/xpcom/xpcAccessibilityService.h index 76389a8a5..94498ed5c 100644 --- a/accessible/xpcom/xpcAccessibilityService.h +++ b/accessible/xpcom/xpcAccessibilityService.h @@ -7,6 +7,9 @@ #include "nsIAccessibilityService.h" +#include "nsCOMPtr.h" +#include "nsITimer.h" + class xpcAccessibilityService : public nsIAccessibleRetrieval { 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" diff --git a/accessible/xul/moz.build b/accessible/xul/moz.build index df159b274..8ca9f68f4 100644 --- a/accessible/xul/moz.build +++ b/accessible/xul/moz.build @@ -4,7 +4,7 @@ # 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/. -UNIFIED_SOURCES += [ +SOURCES += [ 'XULAlertAccessible.cpp', 'XULColorPickerAccessible.cpp', 'XULComboboxAccessible.cpp', |