diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-06 19:47:29 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-06 19:47:29 -0500 |
| commit | 6da9e3c6b9aa7e0be236a6f5c4f9498c25a08c3c (patch) | |
| tree | f5e4fdfaa9be98d15ee7e5e0d8265ed461dfd55f /layout | |
| parent | 5483f807c2663be8c63caf8d59ee151b3ef499d3 (diff) | |
| download | UXP-6da9e3c6b9aa7e0be236a6f5c4f9498c25a08c3c.tar UXP-6da9e3c6b9aa7e0be236a6f5c4f9498c25a08c3c.tar.gz UXP-6da9e3c6b9aa7e0be236a6f5c4f9498c25a08c3c.tar.lz UXP-6da9e3c6b9aa7e0be236a6f5c4f9498c25a08c3c.tar.xz UXP-6da9e3c6b9aa7e0be236a6f5c4f9498c25a08c3c.zip | |
Issue #1395 - Remove FlyWeb Service
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/build/nsLayoutModule.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index 3271a640d..4455da122 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -178,8 +178,6 @@ static void Shutdown(); #include "AudioChannelService.h" #include "mozilla/net/WebSocketEventService.h" -#include "mozilla/dom/FlyWebService.h" - #include "mozilla/dom/power/PowerManagerService.h" #include "mozilla/dom/time/TimeService.h" #include "StreamingProtocolService.h" @@ -510,17 +508,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(Geolocation, Init) #define NS_WEBSOCKETEVENT_SERVICE_CID \ { 0x31689828, 0xda66, 0x49a6, { 0x87, 0x0c, 0xdf, 0x62, 0xb8, 0x3f, 0xe7, 0x89 }} -#define NS_FLYWEB_SERVICE_CID \ - { 0x5de19ef0, 0x895e, 0x4c0c, { 0xa6, 0xe0, 0xea, 0xe0, 0x23, 0x2b, 0x84, 0x5a } } - NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsGeolocationService, nsGeolocationService::GetGeolocationService) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(AudioChannelService, AudioChannelService::GetOrCreate) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(WebSocketEventService, WebSocketEventService::GetOrCreate) -NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(FlyWebService, FlyWebService::GetOrCreateAddRefed) - #ifdef MOZ_WEBSPEECH_TEST_BACKEND NS_GENERIC_FACTORY_CONSTRUCTOR(FakeSpeechRecognitionService) #endif @@ -657,7 +650,6 @@ NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID); NS_DEFINE_NAMED_CID(NS_AUDIOCHANNEL_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_WEBSOCKETEVENT_SERVICE_CID); -NS_DEFINE_NAMED_CID(NS_FLYWEB_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID); NS_DEFINE_NAMED_CID(NS_CONTENTSECURITYMANAGER_CID); NS_DEFINE_NAMED_CID(CSPSERVICE_CID); @@ -919,7 +911,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = { { &kNS_GEOLOCATION_CID, false, nullptr, GeolocationConstructor }, { &kNS_AUDIOCHANNEL_SERVICE_CID, false, nullptr, AudioChannelServiceConstructor }, { &kNS_WEBSOCKETEVENT_SERVICE_CID, false, nullptr, WebSocketEventServiceConstructor }, - { &kNS_FLYWEB_SERVICE_CID, false, nullptr, FlyWebServiceConstructor }, { &kNS_FOCUSMANAGER_CID, false, nullptr, CreateFocusManager }, #ifdef MOZ_WEBSPEECH_TEST_BACKEND { &kNS_FAKE_SPEECH_RECOGNITION_SERVICE_CID, false, nullptr, FakeSpeechRecognitionServiceConstructor }, @@ -1046,8 +1037,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = { { "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID }, { "@mozilla.org/audiochannel/service;1", &kNS_AUDIOCHANNEL_SERVICE_CID }, { "@mozilla.org/websocketevent/service;1", &kNS_WEBSOCKETEVENT_SERVICE_CID }, - { "@mozilla.org/flyweb-service;1", &kNS_FLYWEB_SERVICE_CID }, - { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "flyweb", &kNS_FLYWEB_SERVICE_CID }, { "@mozilla.org/focus-manager;1", &kNS_FOCUSMANAGER_CID }, #ifdef MOZ_WEBSPEECH_TEST_BACKEND { NS_SPEECH_RECOGNITION_SERVICE_CONTRACTID_PREFIX "fake", &kNS_FAKE_SPEECH_RECOGNITION_SERVICE_CID }, |