diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-16 09:48:07 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:33 -0400 |
| commit | f4908dd916dd657b66d94ebdf7f0215a8fabf0a7 (patch) | |
| tree | 5cb6304fa72e89cd2a0394fed77dfed33e51d8f4 /layout | |
| parent | 9d72efd30c8725e0069b90304bfea0470d7c8bb9 (diff) | |
| download | uxp-f4908dd916dd657b66d94ebdf7f0215a8fabf0a7.tar.gz | |
1332245 - Move nsScriptError from js/xpconnect to dom/bindings.
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/build/moz.build | 1 | ||||
| -rw-r--r-- | layout/build/nsLayoutModule.cpp | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/layout/build/moz.build b/layout/build/moz.build index 5b607c171f..ecf180d78e 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 8bb70f85c0..9313b8e455 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 } }; |