summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-04-19 14:38:07 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-24 10:34:20 +0200
commitd0a2389b43cfacc38320ec87922bbf71868c2b4d (patch)
treee86cf6520211ad178832463914b7971e128376e5
parent796a14e11675c7c5f3b73b59d9d18f0acf2049fc (diff)
downloadUXP-d0a2389b43cfacc38320ec87922bbf71868c2b4d.tar
UXP-d0a2389b43cfacc38320ec87922bbf71868c2b4d.tar.gz
UXP-d0a2389b43cfacc38320ec87922bbf71868c2b4d.tar.lz
UXP-d0a2389b43cfacc38320ec87922bbf71868c2b4d.tar.xz
UXP-d0a2389b43cfacc38320ec87922bbf71868c2b4d.zip
Issue #80 - De-unify dom/events
-rw-r--r--dom/events/DOMEventTargetHelper.cpp1
-rw-r--r--dom/events/EventTarget.cpp1
-rw-r--r--dom/events/IMEContentObserver.h1
-rw-r--r--dom/events/IMEStateManager.cpp1
-rw-r--r--dom/events/TextClause.h1
-rw-r--r--dom/events/TouchEvent.cpp2
-rw-r--r--dom/events/moz.build10
7 files changed, 10 insertions, 7 deletions
diff --git a/dom/events/DOMEventTargetHelper.cpp b/dom/events/DOMEventTargetHelper.cpp
index dd9a01d8d..7daf7f7a7 100644
--- a/dom/events/DOMEventTargetHelper.cpp
+++ b/dom/events/DOMEventTargetHelper.cpp
@@ -13,6 +13,7 @@
#include "mozilla/EventDispatcher.h"
#include "mozilla/EventListenerManager.h"
#include "mozilla/Likely.h"
+#include "mozilla/Unused.h"
namespace mozilla {
diff --git a/dom/events/EventTarget.cpp b/dom/events/EventTarget.cpp
index 6c4cbf2d0..b111b9f9d 100644
--- a/dom/events/EventTarget.cpp
+++ b/dom/events/EventTarget.cpp
@@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/EventListenerManager.h"
+#include "mozilla/dom/Event.h"
#include "mozilla/dom/EventTarget.h"
#include "mozilla/dom/EventTargetBinding.h"
#include "nsThreadUtils.h"
diff --git a/dom/events/IMEContentObserver.h b/dom/events/IMEContentObserver.h
index d2f65e186..e459096d9 100644
--- a/dom/events/IMEContentObserver.h
+++ b/dom/events/IMEContentObserver.h
@@ -7,6 +7,7 @@
#ifndef mozilla_IMEContentObserver_h_
#define mozilla_IMEContentObserver_h_
+#include "ContentEventHandler.h"
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsCycleCollectionParticipant.h"
diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp
index 80abad3cc..fd628fb6f 100644
--- a/dom/events/IMEStateManager.cpp
+++ b/dom/events/IMEStateManager.cpp
@@ -18,6 +18,7 @@
#include "mozilla/TextComposition.h"
#include "mozilla/TextEvents.h"
#include "mozilla/Unused.h"
+#include "mozilla/dom/Event.h"
#include "mozilla/dom/HTMLFormElement.h"
#include "mozilla/dom/TabParent.h"
diff --git a/dom/events/TextClause.h b/dom/events/TextClause.h
index 7f85333e8..b9f3c1519 100644
--- a/dom/events/TextClause.h
+++ b/dom/events/TextClause.h
@@ -12,6 +12,7 @@
#include "mozilla/ErrorResult.h"
#include "mozilla/dom/BindingDeclarations.h"
#include "nsCycleCollectionParticipant.h"
+#include "nsPIDOMWindow.h"
#include "nsWrapperCache.h"
namespace mozilla {
diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp
index 9b7a74ac2..0656021a0 100644
--- a/dom/events/TouchEvent.cpp
+++ b/dom/events/TouchEvent.cpp
@@ -16,6 +16,8 @@
namespace mozilla {
+using namespace widget;
+
namespace dom {
/******************************************************************************
diff --git a/dom/events/moz.build b/dom/events/moz.build
index ec3813207..661f56c7e 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -76,7 +76,7 @@ EXPORTS.mozilla.dom += [
if CONFIG['MOZ_WEBSPEECH']:
EXPORTS.mozilla.dom += ['SpeechRecognitionError.h']
-UNIFIED_SOURCES += [
+SOURCES += [
'AnimationEvent.cpp',
'AsyncEventDispatcher.cpp',
'BeforeAfterKeyboardEvent.cpp',
@@ -97,6 +97,7 @@ UNIFIED_SOURCES += [
'EventDispatcher.cpp',
'EventListenerManager.cpp',
'EventListenerService.cpp',
+ 'EventStateManager.cpp',
'EventTarget.cpp',
'FocusEvent.cpp',
'ImageCaptureError.cpp',
@@ -126,13 +127,8 @@ UNIFIED_SOURCES += [
'XULCommandEvent.cpp',
]
-# nsEventStateManager.cpp should be built separately because of Mac OS X headers.
-SOURCES += [
- 'EventStateManager.cpp',
-]
-
if CONFIG['MOZ_WEBSPEECH']:
- UNIFIED_SOURCES += ['SpeechRecognitionError.cpp']
+ SOURCES += ['SpeechRecognitionError.cpp']
include('/ipc/chromium/chromium-config.mozbuild')