From 2a7da6162286b4a35ac3ebcdd4e723e09ea614bd Mon Sep 17 00:00:00 2001 From: "aaronl%netscape.com" Date: Sun, 16 Mar 2003 20:22:51 +0000 Subject: [PATCH] Bug 196946. Combine static accessibility libs into widget library. r=kyle, sr=alecf git-svn-id: svn://10.0.0.236/trunk@139575 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 13 ++-- mozilla/accessible/Makefile.in | 2 +- mozilla/accessible/build/Makefile.in | 70 ----------------- .../build/nsAccessibilityFactory.cpp | 76 ------------------- .../src/base/nsAccessibilityService.h | 8 +- .../accessible/src/base/nsCaretAccessible.cpp | 1 + .../accessible/src/xul/nsXULTabAccessible.cpp | 1 + .../config/basebrowser-installer-win.pkg | 1 - mozilla/embedding/config/basebrowser-win | 1 - mozilla/widget/src/beos/Makefile.in | 17 +++++ mozilla/widget/src/beos/nsWidgetFactory.cpp | 12 +++ mozilla/widget/src/build/Makefile.in | 16 ++++ .../widget/src/build/nsWinWidgetFactory.cpp | 12 +++ mozilla/widget/src/cocoa/Makefile.in | 17 +++++ mozilla/widget/src/cocoa/nsWidgetFactory.mm | 15 +++- mozilla/widget/src/gtk2/Makefile.in | 15 ++++ mozilla/widget/src/gtk2/nsWidgetFactory.cpp | 10 +++ mozilla/widget/src/mac/Makefile.in | 17 +++++ mozilla/widget/src/mac/nsWidgetFactory.cpp | 12 +++ mozilla/widget/src/os2/Makefile.in | 18 ++++- mozilla/widget/src/os2/nsWidgetFactory.cpp | 12 +++ mozilla/widget/src/photon/Makefile.in | 19 ++++- mozilla/widget/src/photon/nsWidgetFactory.cpp | 12 +++ mozilla/xpinstall/packager/packages-mac | 1 - mozilla/xpinstall/packager/packages-os2 | 1 - mozilla/xpinstall/packager/packages-unix | 1 - 26 files changed, 216 insertions(+), 164 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 51fcb50c298..b945c884ed8 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -181,9 +181,16 @@ tier_9_dirs += \ modules/plugin \ dom \ view \ - widget \ content \ layout \ + $(NULL) + +ifdef ACCESSIBILITY +tier_9_dirs += accessible +endif + +tier_9_dirs += \ + widget \ db \ xpfe/components/shistory \ docshell \ @@ -195,10 +202,6 @@ tier_9_dirs += \ themes \ $(NULL) -ifdef ACCESSIBILITY -tier_9_dirs += accessible -endif - ifdef MOZ_LDAP_XPCOM tier_9_dirs += directory/xpcom endif diff --git a/mozilla/accessible/Makefile.in b/mozilla/accessible/Makefile.in index e8cc051b4e1..3f04993c2db 100644 --- a/mozilla/accessible/Makefile.in +++ b/mozilla/accessible/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src build +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in index 84ff115593f..e69de29bb2d 100644 --- a/mozilla/accessible/build/Makefile.in +++ b/mozilla/accessible/build/Makefile.in @@ -1,70 +0,0 @@ -# -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): John Gaunt (jgaunt@netscape.com) -# - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = accessibility -LIBRARY_NAME = accessibility -EXPORT_LIBRARY = 1 -ifneq ($(OS_ARCH),WINNT) -SHORT_LIBNAME = access -endif -IS_COMPONENT = 1 -MODULE_NAME = nsAccessibilityModule -GRE_MODULE = 1 - -REQUIRES = \ - xpcom \ - string \ - dom \ - $(NULL) - -CPPSRCS = nsAccessibilityFactory.cpp - -LOCAL_INCLUDES = -I$(srcdir)/../src - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef MOZ_XUL -SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) -endif - -EXTRA_DSO_LIBS = \ - gkconshared_s \ - gkgfx \ - $(NULL) - -EXTRA_DSO_LDOPTS = \ - $(LIBS_DIR) \ - $(EXTRA_DSO_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/accessible/build/nsAccessibilityFactory.cpp b/mozilla/accessible/build/nsAccessibilityFactory.cpp index 2d2660f24ba..e69de29bb2d 100644 --- a/mozilla/accessible/build/nsAccessibilityFactory.cpp +++ b/mozilla/accessible/build/nsAccessibilityFactory.cpp @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsCOMPtr.h" -#include "nsIModule.h" -#include "nsIGenericFactory.h" - -#include "nsIServiceManager.h" -#include "nsIComponentManager.h" -#include "nsIAccessibilityService.h" -#include "nscore.h" - -static NS_IMETHODIMP -NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult) -{ - nsresult rv; - NS_ASSERTION(aOuter == nsnull, "no aggregation"); - nsIAccessibilityService* accessibility; - rv = NS_NewAccessibilityService(&accessibility); - if (NS_FAILED(rv)) { - NS_ERROR("Unable to construct chrome registry"); - return rv; - } - rv = accessibility->QueryInterface(aIID, aResult); - NS_ASSERTION(NS_SUCCEEDED(rv), "unable to find correct interface"); - NS_RELEASE(accessibility); - return rv; -} - -// The list of components we register -static const nsModuleComponentInfo components[] = -{ - { "AccessibilityService", - NS_ACCESSIBILITY_SERVICE_CID, - "@mozilla.org/accessibilityService;1", - NS_ConstructAccessibilityService - }, -}; - -NS_IMPL_NSGETMODULE(nsAccessibilityModule, components); - diff --git a/mozilla/accessible/src/base/nsAccessibilityService.h b/mozilla/accessible/src/base/nsAccessibilityService.h index c480807af8f..459948d79e2 100644 --- a/mozilla/accessible/src/base/nsAccessibilityService.h +++ b/mozilla/accessible/src/base/nsAccessibilityService.h @@ -40,10 +40,10 @@ #define __nsAccessibilityService_h__ #include "nsIAccessibilityService.h" -#include "nsIContent.h" -#include "nsIPresShell.h" -#include "nsIDocShell.h" -#include "nsObjectFrame.h" +class nsIContent; +class nsIPresShell; +class nsIDocShell; +class nsObjectFrame; class nsIFrame; class nsIWeakReference; diff --git a/mozilla/accessible/src/base/nsCaretAccessible.cpp b/mozilla/accessible/src/base/nsCaretAccessible.cpp index 920bd7930f4..15f41c2e7bc 100644 --- a/mozilla/accessible/src/base/nsCaretAccessible.cpp +++ b/mozilla/accessible/src/base/nsCaretAccessible.cpp @@ -35,6 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ +#include "nsIServiceManager.h" #include "nsAccessibilityService.h" #include "nsCaretAccessible.h" #include "nsIDocument.h" diff --git a/mozilla/accessible/src/xul/nsXULTabAccessible.cpp b/mozilla/accessible/src/xul/nsXULTabAccessible.cpp index f8e86d151c9..c6db1238ed8 100644 --- a/mozilla/accessible/src/xul/nsXULTabAccessible.cpp +++ b/mozilla/accessible/src/xul/nsXULTabAccessible.cpp @@ -47,6 +47,7 @@ #include "nsIDOMXULSelectCntrlEl.h" #include "nsIDOMXULSelectCntrlItemEl.h" #include "nsIFrame.h" +#include "nsObjectFrame.h" #include "nsIPluginViewer.h" #include "nsIScriptGlobalObject.h" #include "nsIWebShell.h" diff --git a/mozilla/embedding/config/basebrowser-installer-win.pkg b/mozilla/embedding/config/basebrowser-installer-win.pkg index f7d278a5120..31c9520acb6 100644 --- a/mozilla/embedding/config/basebrowser-installer-win.pkg +++ b/mozilla/embedding/config/basebrowser-installer-win.pkg @@ -88,7 +88,6 @@ components\imglib2.dll ; accessibility (out of process API support) ; see http://www.mozilla.org/projects/ui/accessibility/vendors-win.html -components\accessibility.dll components\accessibility.xpt ; caps (JavaScript security) diff --git a/mozilla/embedding/config/basebrowser-win b/mozilla/embedding/config/basebrowser-win index e4119eac7a8..0222f97b196 100644 --- a/mozilla/embedding/config/basebrowser-win +++ b/mozilla/embedding/config/basebrowser-win @@ -91,7 +91,6 @@ components\imglib2.dll ; accessibility (out of process API support) ; see http://www.mozilla.org/projects/ui/accessibility/vendors-win.html -components\accessibility.dll components\accessibility.xpt ; caps (JavaScript security) diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in index 6f447d44f42..a3239271d2c 100644 --- a/mozilla/widget/src/beos/Makefile.in +++ b/mozilla/widget/src/beos/Makefile.in @@ -66,14 +66,30 @@ CPPSRCS = \ SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + EXTRA_DSO_LDOPTS = \ -ltracker \ $(TOOLKIT_DSO_LDOPTS) \ + $(EXTRA_DSO_LIBS) \ $(MOZ_COMPONENT_LIBS) \ -lgkgfx \ $(TK_LIBS) \ $(NULL) +ifdef ACCESSIBILITY +EXTRA_DSO_LIBS += gkconshared_s +endif + include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir) @@ -84,4 +100,5 @@ INCLUDES += \ -I$(srcdir)/../xpwidgets \ -I$(srcdir) \ -I$(srcdir)/../../timer/src/beos \ + -I$(srcdir)/../../../accessible/src/base \ $(NULL) diff --git a/mozilla/widget/src/beos/nsWidgetFactory.cpp b/mozilla/widget/src/beos/nsWidgetFactory.cpp index a5f424a4473..f77e6a242d5 100644 --- a/mozilla/widget/src/beos/nsWidgetFactory.cpp +++ b/mozilla/widget/src/beos/nsWidgetFactory.cpp @@ -58,6 +58,9 @@ #include "nsClipboardHelper.h" #include "nsHTMLFormatConverter.h" #include "nsDragService.h" +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" +#endif NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow) @@ -73,6 +76,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif static nsresult nsHorizScrollbarConstructor(nsISupports *aOuter,REFNSIID aIID, void **aResult) @@ -188,6 +194,12 @@ static const nsModuleComponentInfo components[] = NS_FILEPICKER_CID, "@mozilla.org/filepicker;1", nsFilePickerConstructor }, +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; NS_IMPL_NSGETMODULE(nsWidgetBeOSModule,components) diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in index 056d5664ddb..40d60b66222 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/widget/src/build/Makefile.in @@ -47,9 +47,14 @@ CPPSRCS = nsWinWidgetFactory.cpp EXTRA_DSO_LIBS = gkgfx +ifdef ACCESSIBILITY +EXTRA_DSO_LIBS += gkconshared_s +endif + LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../xpwidgets \ + -I$(srcdir)/../../../accessible/src/base \ -I$(srcdir)/../windows \ $(NULL) @@ -61,6 +66,17 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ $(NULL) +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + EXTRA_DSO_LDOPTS = \ $(LIBS_DIR) \ $(EXTRA_DSO_LIBS) \ diff --git a/mozilla/widget/src/build/nsWinWidgetFactory.cpp b/mozilla/widget/src/build/nsWinWidgetFactory.cpp index dd357f81b81..e276244611b 100644 --- a/mozilla/widget/src/build/nsWinWidgetFactory.cpp +++ b/mozilla/widget/src/build/nsWinWidgetFactory.cpp @@ -61,6 +61,9 @@ #include "nsTransferable.h" #include "nsHTMLFormatConverter.h" #include "nsDragService.h" +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" +#endif #include "nsIGenericFactory.h" @@ -78,6 +81,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFullScreen) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif static NS_IMETHODIMP nsHorizScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -207,6 +213,12 @@ static const nsModuleComponentInfo components[] = NS_BIDIKEYBOARD_CID, "@mozilla.org/widget/bidikeyboard;1", nsBidiKeyboardConstructor }, +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; diff --git a/mozilla/widget/src/cocoa/Makefile.in b/mozilla/widget/src/cocoa/Makefile.in index 71590ba82f6..eff7a3c0245 100644 --- a/mozilla/widget/src/cocoa/Makefile.in +++ b/mozilla/widget/src/cocoa/Makefile.in @@ -97,13 +97,29 @@ XPIDLSRCS += \ SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + EXTRA_DSO_LDOPTS += \ $(MOZ_UNICHARUTIL_LIBS) \ + $(EXTRA_DSO_LIBS) \ $(TK_LIBS) \ $(MOZ_COMPONENT_LIBS) \ -lgkgfx \ $(NULL) +ifdef ACCESSIBILITY +EXTRA_DSO_LIBS += gkconshared_s +endif + GARBAGE += $(GFX_LCPPSRCS) include $(topsrcdir)/config/rules.mk @@ -132,6 +148,7 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../xpwidgets \ -I/System/Library/Frameworks/Carbon.Framework/Headers \ -I/System/Library/Frameworks/Cocoa.Framework/Headers \ + -I$(srcdir)/../../../accessible/src/base \ $(NULL) # for "EnterMovies" in nsSound.cpp diff --git a/mozilla/widget/src/cocoa/nsWidgetFactory.mm b/mozilla/widget/src/cocoa/nsWidgetFactory.mm index 04f44e9af8f..bba5965e608 100644 --- a/mozilla/widget/src/cocoa/nsWidgetFactory.mm +++ b/mozilla/widget/src/cocoa/nsWidgetFactory.mm @@ -59,6 +59,10 @@ #include "nsHTMLFormatConverter.h" #include "nsDragService.h" #include "nsDragHelperService.h" +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" +#endif + #if USE_NATIVE_VERSION # include "nsCheckButton.h" @@ -98,7 +102,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragHelperService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) - +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif +s static nsModuleComponentInfo components[] = { @@ -186,6 +193,12 @@ static nsModuleComponentInfo components[] = NS_NATIVESCROLLBAR_CID, "@mozilla.org/widget/nativescrollbar;1", nsNativeScrollbarConstructor }, +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; NS_IMPL_NSGETMODULE(nsWidgetMacModule, components) diff --git a/mozilla/widget/src/gtk2/Makefile.in b/mozilla/widget/src/gtk2/Makefile.in index 5e02ca0039c..f1fa6986dcd 100644 --- a/mozilla/widget/src/gtk2/Makefile.in +++ b/mozilla/widget/src/gtk2/Makefile.in @@ -73,8 +73,22 @@ endif SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif + +EXTRA_DSO_LIBS += gkconshared_s +endif + EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ + $(EXTRA_DSO_LIBS) \ -lgkgfx \ $(XLDFLAGS) \ $(XLIBS) \ @@ -94,6 +108,7 @@ CXXFLAGS += $(MOZ_GTK2_CFLAGS) INCLUDES += \ -I$(srcdir)/../xpwidgets \ + -I$(srcdir)/../../../accessible/src/base \ $(NULL) test_container: mozdrawingarea.o mozcontainer.o test_container.c diff --git a/mozilla/widget/src/gtk2/nsWidgetFactory.cpp b/mozilla/widget/src/gtk2/nsWidgetFactory.cpp index 3ac3bb86865..6c34039d037 100644 --- a/mozilla/widget/src/gtk2/nsWidgetFactory.cpp +++ b/mozilla/widget/src/gtk2/nsWidgetFactory.cpp @@ -53,6 +53,7 @@ #include "nsBidiKeyboard.h" #ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" #include "nsAccessibilityInterface.h" #endif @@ -68,6 +69,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsClipboard, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound) +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif static nsresult nsHorizScrollbarConstructor (nsISupports *aOuter, @@ -185,6 +189,12 @@ static const nsModuleComponentInfo components[] = NS_BIDIKEYBOARD_CID, "@mozilla.org/widget/bidikeyboard;1", nsBidiKeyboardConstructor }, +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; PR_STATIC_CALLBACK(void) diff --git a/mozilla/widget/src/mac/Makefile.in b/mozilla/widget/src/mac/Makefile.in index 8964aa1425e..fd8b12f0a58 100644 --- a/mozilla/widget/src/mac/Makefile.in +++ b/mozilla/widget/src/mac/Makefile.in @@ -105,13 +105,29 @@ XPIDLSRCS += \ SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + EXTRA_DSO_LDOPTS += \ $(MOZ_UNICHARUTIL_LIBS) \ + $(EXTRA_DSO_LIBS) \ $(TK_LIBS) \ $(MOZ_COMPONENT_LIBS) \ -lgkgfx \ $(NULL) +ifdef ACCESSIBILITY +EXTRA_DSO_LIBS += gkconshared_s +endif + GARBAGE += $(GFX_LCPPSRCS) include $(topsrcdir)/config/rules.mk @@ -137,6 +153,7 @@ libs:: $(RES_DEST) LOCAL_INCLUDES = \ $(TK_CFLAGS) \ -I$(topsrcdir)/gfx/src/mac \ + -I$(srcdir)/../../../accessible/src/base \ -I$(srcdir)/../xpwidgets \ $(NULL) diff --git a/mozilla/widget/src/mac/nsWidgetFactory.cpp b/mozilla/widget/src/mac/nsWidgetFactory.cpp index 598115ac37f..eb01c2767c5 100644 --- a/mozilla/widget/src/mac/nsWidgetFactory.cpp +++ b/mozilla/widget/src/mac/nsWidgetFactory.cpp @@ -74,6 +74,9 @@ #include "nsHTMLFormatConverter.h" #include "nsDragService.h" #include "nsDragHelperService.h" +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" +#endif #if USE_NATIVE_VERSION # include "nsCheckButton.h" @@ -118,6 +121,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragHelperService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeScrollbar) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif static const nsModuleComponentInfo components[] = { @@ -217,6 +223,12 @@ static const nsModuleComponentInfo components[] = NS_BIDIKEYBOARD_CID, "@mozilla.org/widget/bidikeyboard;1", nsBidiKeyboardConstructor }, +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; NS_IMPL_NSGETMODULE(nsWidgetMacModule, components) diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in index 164f39a122e..71991742e6f 100644 --- a/mozilla/widget/src/os2/Makefile.in +++ b/mozilla/widget/src/os2/Makefile.in @@ -67,8 +67,23 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ $(NULL) +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + EXTRA_DSO_LIBS = gkgfx +ifdef ACCESSIBILITY +EXTRA_DSO_LIBS += gkconshared_s +endif + EXTRA_DSO_LDOPTS = \ $(EXTRA_DSO_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \ @@ -89,7 +104,8 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_WIDGET -LOCAL_INCLUDES = -I. -I$(srcdir)/../xpwidgets -I$(srcdir) +LOCAL_INCLUDES = -I. -I$(srcdir)/../xpwidgets -I$(srcdir) \ + -I$(srcdir)/../../../accessible/src/base export:: test -d ./res || mkdir ./res diff --git a/mozilla/widget/src/os2/nsWidgetFactory.cpp b/mozilla/widget/src/os2/nsWidgetFactory.cpp index 11d98ef9501..b63c9010e81 100644 --- a/mozilla/widget/src/os2/nsWidgetFactory.cpp +++ b/mozilla/widget/src/os2/nsWidgetFactory.cpp @@ -57,6 +57,9 @@ #include "nsSound.h" #include "nsToolkit.h" #include "nsModule.h" +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" +#endif // Drag & Drop, Clipboard #include "nsClipboard.h" @@ -79,6 +82,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit) NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif // custom "contructor" methods @@ -279,6 +285,12 @@ static const nsModuleComponentInfo components[] = NS_HTMLFORMATCONVERTER_CID, "@mozilla.org/widget/htmlformatconverter/os2;1", nsHTMLFormatConverterConstructor } +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; PR_STATIC_CALLBACK(void) diff --git a/mozilla/widget/src/photon/Makefile.in b/mozilla/widget/src/photon/Makefile.in index cbff9f1ba1a..c4969c0cd95 100644 --- a/mozilla/widget/src/photon/Makefile.in +++ b/mozilla/widget/src/photon/Makefile.in @@ -65,14 +65,31 @@ CPPSRCS = \ SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a +ifdef ACCESSIBILITY +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_XUL +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) +endif +endif + EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS) \ + $(EXTRA_DSO_LIBS) \ $(TK_LIBS) \ -lgkgfx \ $(NULL) +ifdef ACCESSIBILITY +EXTRA_DSO_LIBS += gkconshared_s +endif + include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir) +DEFINES += -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir) \ + -I$(srcdir)/../../../accessible/src/base CXXFLAGS += $(TK_CFLAGS) diff --git a/mozilla/widget/src/photon/nsWidgetFactory.cpp b/mozilla/widget/src/photon/nsWidgetFactory.cpp index 01c5c72e419..79ab51c7c4b 100644 --- a/mozilla/widget/src/photon/nsWidgetFactory.cpp +++ b/mozilla/widget/src/photon/nsWidgetFactory.cpp @@ -56,6 +56,9 @@ #include "nsBidiKeyboard.h" #endif #include "nsFilePicker.h" +#ifdef ACCESSIBILITY +#include "nsAccessibilityService.h" +#endif #include struct PRLogModuleInfo *PhWidLog = nsnull; @@ -75,6 +78,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker) #ifdef IBMBIDI NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) #endif +#ifdef ACCESSIBILITY +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccessibilityService) +#endif static nsresult nsHorizScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID, void **aResult) { @@ -194,6 +200,12 @@ static nsModuleComponentInfo components[] = NS_FILEPICKER_CID, "@mozilla.org/filepicker;1", nsFilePickerConstructor }, +#ifdef ACCESSIBILITY + { "AccessibilityService", + NS_ACCESSIBILITY_SERVICE_CID, + "@mozilla.org/accessibilityService;1", + nsAccessibilityServiceConstructor }, +#endif }; PR_STATIC_CALLBACK(void) diff --git a/mozilla/xpinstall/packager/packages-mac b/mozilla/xpinstall/packager/packages-mac index 47999f76a8e..f0e82f45521 100644 --- a/mozilla/xpinstall/packager/packages-mac +++ b/mozilla/xpinstall/packager/packages-mac @@ -87,7 +87,6 @@ viewer:Essential Files:PrintDialogPDE.plugin -viewer:Essential Files:PrintDialogPDE.plugin:Contents:Resources:English.lproj:CVS viewer:Components:compreg.dat -viewer:Components:accessibility.shlb viewer:Components:accessibility.xpt viewer:Components:docshell.shlb viewer:Components:AppShell.shlb diff --git a/mozilla/xpinstall/packager/packages-os2 b/mozilla/xpinstall/packager/packages-os2 index 8497d20b383..5bd3c82a0e3 100644 --- a/mozilla/xpinstall/packager/packages-os2 +++ b/mozilla/xpinstall/packager/packages-os2 @@ -75,7 +75,6 @@ bin/mozturbo.exe bin/regxpcom.exe bin/xpicleanup.exe bin/res/cmessage.txt -;bin/components/accessibility.dll bin/components/access.dll bin/components/accessibility.xpt ;bin/components/AcctIdl.dll diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 01858aa0b29..a65e5ff0f5b 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -70,7 +70,6 @@ bin/res/cmessage.txt bin/libgtkembedmoz.so ; this is used by Xprint and Xlib gfx bin/libxlibrgb.so -bin/components/libaccessibility.so bin/components/accessibility.xpt bin/components/libappcomps.so bin/components/bookmarks.xpt