From 61ac6a3ba1e56df6ea2bdbfcba708f5814f1abd0 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sat, 30 Mar 2013 18:29:47 -0400 Subject: [PATCH] bug 870594 - remove accessible/build/ r=bsmedberg f=surkov --- accessible/build/Makefile.in | 48 ------------------- accessible/build/moz.build | 8 ---- accessible/build/nsAccessibilityFactory.cpp | 53 --------------------- accessible/moz.build | 2 +- layout/build/nsLayoutModule.cpp | 17 +++++++ toolkit/library/Makefile.in | 30 ++++++++++-- toolkit/library/nsStaticXULComponents.cpp | 7 --- 7 files changed, 44 insertions(+), 121 deletions(-) delete mode 100644 accessible/build/Makefile.in delete mode 100644 accessible/build/moz.build delete mode 100644 accessible/build/nsAccessibilityFactory.cpp diff --git a/accessible/build/Makefile.in b/accessible/build/Makefile.in deleted file mode 100644 index 2031d0d0f3f..00000000000 --- a/accessible/build/Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBRARY_NAME = accessibility -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 -MODULE_NAME = nsAccessibilityModule -LIBXUL_LIBRARY = 1 - -CPPSRCS = nsAccessibilityFactory.cpp - -LOCAL_INCLUDES = -I$(srcdir)/../src - -SHARED_LIBRARY_LIBS = \ - ../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ - ../src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \ - ../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ - ../src/xpcom/$(LIB_PREFIX)accessibility_xpcom_s.$(LIB_SUFFIX) \ - $(NULL) - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -SHARED_LIBRARY_LIBS += \ - ../src/windows/msaa/$(LIB_PREFIX)accessibility_toolkit_msaa_s.$(LIB_SUFFIX) \ - ../src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX) \ - ../src/windows/sdn/$(LIB_PREFIX)accessibility_toolkit_sdn_s.$(LIB_SUFFIX) \ - ../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX) \ - $(NULL) -else -SHARED_LIBRARY_LIBS += \ - ../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_XUL -SHARED_LIBRARY_LIBS += ../src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) -endif - -include $(topsrcdir)/config/rules.mk - diff --git a/accessible/build/moz.build b/accessible/build/moz.build deleted file mode 100644 index c7f93f43bd4..00000000000 --- a/accessible/build/moz.build +++ /dev/null @@ -1,8 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -MODULE = 'accessibility' - diff --git a/accessible/build/nsAccessibilityFactory.cpp b/accessible/build/nsAccessibilityFactory.cpp deleted file mode 100644 index 4f618210053..00000000000 --- a/accessible/build/nsAccessibilityFactory.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#include "nsCOMPtr.h" -#include "mozilla/ModuleUtils.h" - -#include "nsIServiceManager.h" -#include "nsIComponentManager.h" -#include "nsIAccessibilityService.h" -#include "nsIAccessibleRetrieval.h" -#include "nscore.h" - -static nsresult -NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult) -{ - nsresult rv; - NS_ASSERTION(aOuter == nullptr, "no aggregation"); - nsIAccessibilityService* accessibility; - rv = NS_GetAccessibilityService(&accessibility); - if (NS_FAILED(rv)) { - NS_ERROR("Unable to construct accessibility service"); - return rv; - } - rv = accessibility->QueryInterface(aIID, aResult); - NS_ASSERTION(NS_SUCCEEDED(rv), "unable to find correct interface"); - NS_RELEASE(accessibility); - return rv; -} - -NS_DEFINE_NAMED_CID(NS_ACCESSIBILITY_SERVICE_CID); - -static const mozilla::Module::CIDEntry kA11yCIDs[] = { - { &kNS_ACCESSIBILITY_SERVICE_CID, false, nullptr, NS_ConstructAccessibilityService }, - { nullptr } -}; - -static const mozilla::Module::ContractIDEntry kA11yContracts[] = { - { "@mozilla.org/accessibilityService;1", &kNS_ACCESSIBILITY_SERVICE_CID }, - { "@mozilla.org/accessibleRetrieval;1", &kNS_ACCESSIBILITY_SERVICE_CID }, - { nullptr } -}; - -static const mozilla::Module kA11yModule = { - mozilla::Module::kVersion, - kA11yCIDs, - kA11yContracts -}; - -NSMODULE_DEFN(nsAccessibilityModule) = &kA11yModule; - - diff --git a/accessible/moz.build b/accessible/moz.build index 4fb3d970f6f..dbd2b9f8dd2 100644 --- a/accessible/moz.build +++ b/accessible/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/. -DIRS += ['public', 'src', 'build'] +DIRS += ['public', 'src'] TEST_DIRS += ['tests'] MODULE = 'accessibility' diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index 48d68de84da..3730639572a 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -676,6 +676,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsStructuredCloneContainer) NS_GENERIC_FACTORY_CONSTRUCTOR(OSFileConstantsService) NS_GENERIC_FACTORY_CONSTRUCTOR(TCPSocketChild) +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" + + MAKE_CTOR(CreateA11yService, nsIAccessibilityService, NS_GetAccessibilityService) +#endif + static nsresult Construct_nsIScriptSecurityManager(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -848,6 +854,10 @@ NS_DEFINE_NAMED_CID(NS_FAKE_SPEECH_RECOGNITION_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_SYNTHVOICEREGISTRY_CID); #endif +#ifdef ACCESSIBILITY +NS_DEFINE_NAMED_CID(NS_ACCESSIBILITY_SERVICE_CID); +#endif + static nsresult CreateWindowCommandTableConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -1128,6 +1138,9 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = { { &kNS_MEDIAMANAGERSERVICE_CID, false, NULL, nsIMediaManagerServiceConstructor }, #ifdef MOZ_GAMEPAD { &kNS_GAMEPAD_TEST_CID, false, NULL, GamepadServiceTestConstructor }, +#endif +#ifdef ACCESSIBILITY + { &kNS_ACCESSIBILITY_SERVICE_CID, false, NULL, CreateA11yService }, #endif { NULL } }; @@ -1278,6 +1291,10 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = { { NS_GAMEPAD_TEST_CONTRACTID, &kNS_GAMEPAD_TEST_CID }, #endif { MEDIAMANAGERSERVICE_CONTRACTID, &kNS_MEDIAMANAGERSERVICE_CID }, +#ifdef ACCESSIBILITY + { "@mozilla.org/accessibilityService;1", &kNS_ACCESSIBILITY_SERVICE_CID }, + { "@mozilla.org/accessibleRetrieval;1", &kNS_ACCESSIBILITY_SERVICE_CID }, +#endif { NULL } }; diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 5c7b22a3d73..72118a4fcb4 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -42,6 +42,32 @@ SHARED_LIBRARY_LIBS += \ $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \ $(NULL) +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DEPTH)/accessible/src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DEPTH)/accessible/src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \ + $(DEPTH)/accessible/src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(DEPTH)/accessible/src/xpcom/$(LIB_PREFIX)accessibility_xpcom_s.$(LIB_SUFFIX) \ + $(NULL) + +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +SHARED_LIBRARY_LIBS += \ + $(DEPTH)/accessible/src/windows/msaa/$(LIB_PREFIX)accessibility_toolkit_msaa_s.$(LIB_SUFFIX) \ + $(DEPTH)/accessible/src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX) \ + $(DEPTH)/accessible/src/windows/sdn/$(LIB_PREFIX)accessibility_toolkit_sdn_s.$(LIB_SUFFIX) \ + $(DEPTH)/accessible/src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX) \ + $(NULL) +else +SHARED_LIBRARY_LIBS += \ + $(DEPTH)/accessible/src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \ + $(NULL) +endif + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DEPTH)/accessible/src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + SHARED_LIBRARY_LIBS += \ $(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \ $(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \ @@ -328,10 +354,6 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) COMPONENT_LIBS += widget_qt endif -ifdef ACCESSIBILITY -COMPONENT_LIBS += accessibility -endif - ifdef MOZ_ENABLE_XREMOTE COMPONENT_LIBS += remoteservice endif diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp index 5b60f11d35c..52806f9d03c 100644 --- a/toolkit/library/nsStaticXULComponents.cpp +++ b/toolkit/library/nsStaticXULComponents.cpp @@ -54,12 +54,6 @@ #define ICON_MODULE #endif -#ifdef ACCESSIBILITY -#define ACCESS_MODULES MODULE(nsAccessibilityModule) -#else -#define ACCESS_MODULES -#endif - #ifdef MOZ_ENABLE_XREMOTE #define XREMOTE_MODULES MODULE(RemoteServiceModule) #else @@ -208,7 +202,6 @@ MODULE(docshell_provider) \ MODULE(embedcomponents) \ MODULE(Browser_Embedding_Module) \ - ACCESS_MODULES \ MODULE(appshell) \ MODULE(nsTransactionManagerModule) \ MODULE(nsComposerModule) \