summaryrefslogtreecommitdiffstats
path: root/layout/build
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2019-06-16 09:48:07 -0400
committerGaming4JC <g4jc@hyperbola.info>2019-07-18 22:38:33 -0400
commit4a82fdad87107d369df20da0a4a0987b1bd821fd (patch)
tree5cb6304fa72e89cd2a0394fed77dfed33e51d8f4 /layout/build
parentd7fbf2a9df8904d495c4c86e6f575d44185eae1b (diff)
downloadUXP-4a82fdad87107d369df20da0a4a0987b1bd821fd.tar
UXP-4a82fdad87107d369df20da0a4a0987b1bd821fd.tar.gz
UXP-4a82fdad87107d369df20da0a4a0987b1bd821fd.tar.lz
UXP-4a82fdad87107d369df20da0a4a0987b1bd821fd.tar.xz
UXP-4a82fdad87107d369df20da0a4a0987b1bd821fd.zip
1332245 - Move nsScriptError from js/xpconnect to dom/bindings.
Diffstat (limited to 'layout/build')
-rw-r--r--layout/build/moz.build1
-rw-r--r--layout/build/nsLayoutModule.cpp9
2 files changed, 10 insertions, 0 deletions
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 5b607c171..ecf180d78 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -31,6 +31,7 @@ LOCAL_INCLUDES += [
'/docshell/base',
'/dom/audiochannel',
'/dom/base',
+ '/dom/bindings',
'/dom/canvas',
'/dom/filesystem',
'/dom/geolocation',
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 8bb70f85c..9313b8e45 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -35,6 +35,7 @@
#include "nsIObserver.h"
#include "nsIObserverService.h"
#include "nsIScriptNameSpaceManager.h"
+#include "nsIScriptError.h"
#include "nsISelection.h"
#include "nsCaret.h"
#include "nsPlainTextSerializer.h"
@@ -192,6 +193,8 @@ static void Shutdown();
#include "mozilla/dom/PresentationDeviceManager.h"
#include "mozilla/dom/PresentationTCPSessionTransport.h"
+#include "nsScriptError.h"
+
#include "mozilla/TextInputProcessor.h"
using namespace mozilla;
@@ -560,6 +563,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(UDPSocketChild)
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(GeckoMediaPluginService, GeckoMediaPluginService::GetGeckoMediaPluginService)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptError)
+
#ifdef ACCESSIBILITY
#include "xpcAccessibilityService.h"
@@ -720,6 +725,8 @@ NS_DEFINE_NAMED_CID(PRESENTATION_TCP_SESSION_TRANSPORT_CID);
NS_DEFINE_NAMED_CID(TEXT_INPUT_PROCESSOR_CID);
+NS_DEFINE_NAMED_CID(NS_SCRIPTERROR_CID);
+
static nsresult
CreateWindowCommandTableConstructor(nsISupports *aOuter,
REFNSIID aIID, void **aResult)
@@ -978,6 +985,7 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
{ &kPRESENTATION_DEVICE_MANAGER_CID, false, nullptr, PresentationDeviceManagerConstructor },
{ &kPRESENTATION_TCP_SESSION_TRANSPORT_CID, false, nullptr, PresentationTCPSessionTransportConstructor },
{ &kTEXT_INPUT_PROCESSOR_CID, false, nullptr, TextInputProcessorConstructor },
+ { &kNS_SCRIPTERROR_CID, false, nullptr, nsScriptErrorConstructor },
{ nullptr }
};
@@ -1109,6 +1117,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
{ PRESENTATION_DEVICE_MANAGER_CONTRACTID, &kPRESENTATION_DEVICE_MANAGER_CID },
{ PRESENTATION_TCP_SESSION_TRANSPORT_CONTRACTID, &kPRESENTATION_TCP_SESSION_TRANSPORT_CID },
{ "@mozilla.org/text-input-processor;1", &kTEXT_INPUT_PROCESSOR_CID },
+ { NS_SCRIPTERROR_CONTRACTID, &kNS_SCRIPTERROR_CID },
{ nullptr }
};