summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-23 17:29:30 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 10:21:37 +0200
commitbbae11cdd9832c86179842edc8e77e3919ac488d (patch)
tree5d5dadd9d3069087d8b24f7fc77c52186a131120
parent917447df6e2336a73fac4552184d654c03417346 (diff)
downloadUXP-bbae11cdd9832c86179842edc8e77e3919ac488d.tar
UXP-bbae11cdd9832c86179842edc8e77e3919ac488d.tar.gz
UXP-bbae11cdd9832c86179842edc8e77e3919ac488d.tar.lz
UXP-bbae11cdd9832c86179842edc8e77e3919ac488d.tar.xz
UXP-bbae11cdd9832c86179842edc8e77e3919ac488d.zip
Issue #80 - De-unify dom/xslt
-rw-r--r--dom/xslt/base/moz.build2
-rw-r--r--dom/xslt/xml/moz.build2
-rw-r--r--dom/xslt/xpath/moz.build2
-rw-r--r--dom/xslt/xslt/moz.build2
-rw-r--r--dom/xslt/xslt/txExecutionState.cpp3
-rw-r--r--dom/xslt/xslt/txMozillaXSLTProcessor.cpp2
6 files changed, 9 insertions, 4 deletions
diff --git a/dom/xslt/base/moz.build b/dom/xslt/base/moz.build
index 7d9cd70fa..d08db4935 100644
--- a/dom/xslt/base/moz.build
+++ b/dom/xslt/base/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 += [
'txDouble.cpp',
'txExpandedName.cpp',
'txExpandedNameMap.cpp',
diff --git a/dom/xslt/xml/moz.build b/dom/xslt/xml/moz.build
index f20a27bba..967035466 100644
--- a/dom/xslt/xml/moz.build
+++ b/dom/xslt/xml/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 += [
'txXMLParser.cpp',
'txXMLUtils.cpp',
]
diff --git a/dom/xslt/xpath/moz.build b/dom/xslt/xpath/moz.build
index 1a7dbf89f..aa989ee91 100644
--- a/dom/xslt/xpath/moz.build
+++ b/dom/xslt/xpath/moz.build
@@ -10,7 +10,7 @@ EXPORTS.mozilla.dom += [
'XPathResult.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'txBooleanExpr.cpp',
'txBooleanResult.cpp',
'txCoreFunctionCall.cpp',
diff --git a/dom/xslt/xslt/moz.build b/dom/xslt/xslt/moz.build
index d629e1d3e..8c9e98a0a 100644
--- a/dom/xslt/xslt/moz.build
+++ b/dom/xslt/xslt/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'txMozillaXSLTProcessor.h'
]
-UNIFIED_SOURCES += [
+SOURCES += [
'txBufferingHandler.cpp',
'txCurrentFunctionCall.cpp',
'txDocumentFunctionCall.cpp',
diff --git a/dom/xslt/xslt/txExecutionState.cpp b/dom/xslt/xslt/txExecutionState.cpp
index 869c3968b..5caaf77f0 100644
--- a/dom/xslt/xslt/txExecutionState.cpp
+++ b/dom/xslt/xslt/txExecutionState.cpp
@@ -13,6 +13,9 @@
#include "txLog.h"
#include "txURIUtils.h"
#include "txXMLParser.h"
+#include "mozilla/Logging.h"
+
+using mozilla::LogLevel;
const int32_t txExecutionState::kMaxRecursionDepth = 20000;
diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
index facb435b4..24c0595dd 100644
--- a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
+++ b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
@@ -37,7 +37,9 @@
#include "nsVariant.h"
#include "mozilla/dom/DocumentFragment.h"
#include "mozilla/dom/XSLTProcessorBinding.h"
+#include "mozilla/ErrorResult.h"
+using namespace mozilla;
using namespace mozilla::dom;
static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID);