summaryrefslogtreecommitdiffstats
path: root/accessible/windows/msaa
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-04-20 11:12:56 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-04-20 11:12:56 +0200
commit32577bdb3d2471c0e5ce4cfd0501a820157230cb (patch)
treed805947d89d0a0b6de8b7a635b0a7ea4a3d69c75 /accessible/windows/msaa
parent51722cd4fecb5c8c79a302f2771cad71535df5ea (diff)
downloadUXP-32577bdb3d2471c0e5ce4cfd0501a820157230cb.tar
UXP-32577bdb3d2471c0e5ce4cfd0501a820157230cb.tar.gz
UXP-32577bdb3d2471c0e5ce4cfd0501a820157230cb.tar.lz
UXP-32577bdb3d2471c0e5ce4cfd0501a820157230cb.tar.xz
UXP-32577bdb3d2471c0e5ce4cfd0501a820157230cb.zip
Stop building /accessible unified and fix deprot.
Tag #80 Note: excludes changes to Mac-specific code because I can't build for OS X to check and fix deprot there.
Diffstat (limited to 'accessible/windows/msaa')
-rw-r--r--accessible/windows/msaa/MsaaIdGenerator.cpp2
-rw-r--r--accessible/windows/msaa/MsaaIdGenerator.h2
-rw-r--r--accessible/windows/msaa/Platform.cpp3
-rw-r--r--accessible/windows/msaa/moz.build10
4 files changed, 8 insertions, 9 deletions
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',