summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-23 14:31:44 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 10:20:16 +0200
commit8a343284d90c79797961be371605e0147c5d2a8d (patch)
tree3a098e49e6361dc2fbb23e2cf41d973905d8119f
parent5a34fb5e1da568ce9e9e8e99423d34d33d0770f9 (diff)
downloaduxp-8a343284d90c79797961be371605e0147c5d2a8d.tar.gz
Issue #80 - De-unify dom/smil
-rw-r--r--dom/smil/moz.build2
-rw-r--r--dom/smil/nsSMILAnimationFunction.cpp1
-rw-r--r--dom/smil/nsSMILCSSProperty.cpp1
-rw-r--r--dom/smil/nsSMILCSSValueType.cpp1
-rw-r--r--dom/smil/nsSMILCompositor.cpp3
-rw-r--r--dom/smil/nsSMILInstanceTime.h1
-rw-r--r--dom/smil/nsSMILTimeContainer.cpp2
7 files changed, 10 insertions, 1 deletions
diff --git a/dom/smil/moz.build b/dom/smil/moz.build
index 5b37ce642a..3c432898f0 100644
--- a/dom/smil/moz.build
+++ b/dom/smil/moz.build
@@ -35,7 +35,7 @@ EXPORTS.mozilla.dom += [
'TimeEvent.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'nsSMILAnimationController.cpp',
'nsSMILAnimationFunction.cpp',
'nsSMILCompositor.cpp',
diff --git a/dom/smil/nsSMILAnimationFunction.cpp b/dom/smil/nsSMILAnimationFunction.cpp
index 767181897f..cd57054fb7 100644
--- a/dom/smil/nsSMILAnimationFunction.cpp
+++ b/dom/smil/nsSMILAnimationFunction.cpp
@@ -24,6 +24,7 @@
#include <math.h>
#include <algorithm>
+using namespace mozilla;
using namespace mozilla::dom;
//----------------------------------------------------------------------
diff --git a/dom/smil/nsSMILCSSProperty.cpp b/dom/smil/nsSMILCSSProperty.cpp
index e745124432..14e428c05b 100644
--- a/dom/smil/nsSMILCSSProperty.cpp
+++ b/dom/smil/nsSMILCSSProperty.cpp
@@ -17,6 +17,7 @@
#include "nsIDOMElement.h"
#include "nsIDocument.h"
+using namespace mozilla;
using namespace mozilla::dom;
// Helper function
diff --git a/dom/smil/nsSMILCSSValueType.cpp b/dom/smil/nsSMILCSSValueType.cpp
index ed89e7710a..2940c13671 100644
--- a/dom/smil/nsSMILCSSValueType.cpp
+++ b/dom/smil/nsSMILCSSValueType.cpp
@@ -18,6 +18,7 @@
#include "nsDebug.h"
#include "nsStyleUtil.h"
#include "nsIDocument.h"
+#include "nsComputedDOMStyle.h"
using namespace mozilla::dom;
using mozilla::StyleAnimationValue;
diff --git a/dom/smil/nsSMILCompositor.cpp b/dom/smil/nsSMILCompositor.cpp
index fe7b2c8286..e7bf60932c 100644
--- a/dom/smil/nsSMILCompositor.cpp
+++ b/dom/smil/nsSMILCompositor.cpp
@@ -9,6 +9,9 @@
#include "nsCSSProps.h"
#include "nsHashKeys.h"
#include "nsSMILCSSProperty.h"
+#include "mozilla/CSSEnabledState.h"
+
+using namespace mozilla;
// PLDHashEntryHdr methods
bool
diff --git a/dom/smil/nsSMILInstanceTime.h b/dom/smil/nsSMILInstanceTime.h
index d5a5807e3b..4602c9127f 100644
--- a/dom/smil/nsSMILInstanceTime.h
+++ b/dom/smil/nsSMILInstanceTime.h
@@ -8,6 +8,7 @@
#define NS_SMILINSTANCETIME_H_
#include "nsSMILTimeValue.h"
+#include "nsISupports.h"
class nsSMILInterval;
class nsSMILTimeContainer;
diff --git a/dom/smil/nsSMILTimeContainer.cpp b/dom/smil/nsSMILTimeContainer.cpp
index 3df8a64cac..e3ebf5b099 100644
--- a/dom/smil/nsSMILTimeContainer.cpp
+++ b/dom/smil/nsSMILTimeContainer.cpp
@@ -11,6 +11,8 @@
#include "mozilla/AutoRestore.h"
+using namespace mozilla;
+
nsSMILTimeContainer::nsSMILTimeContainer()
:
mParent(nullptr),