From 758663e882c49294e58a5c527f3164b6cc72c369 Mon Sep 17 00:00:00 2001 From: adeshkp Date: Sat, 4 May 2019 09:51:45 -0400 Subject: De-unify accessibility build on Mac. Also fixes Linux build bustage with accessibility enabled. --- accessible/base/EventTree.cpp | 1 + accessible/base/Logging.cpp | 2 ++ accessible/base/NotificationController.cpp | 1 + accessible/base/moz.build | 2 +- accessible/base/nsCoreUtils.cpp | 1 + accessible/base/nsEventShell.cpp | 4 ++++ 6 files changed, 10 insertions(+), 1 deletion(-) (limited to 'accessible/base') 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; -- cgit v1.2.3