Bugzilla 151594

Search ".so" and ".sl" file names for plugin libraries.
NETSCAPE_6_2_2_BRANCH checkin only.  Original bug fix 106806 is in 1.0 and trunk.
r: jdunn


git-svn-id: svn://10.0.0.236/branches/NETSCAPE_6_2_2_BRANCH@125095 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/Makefile.in

@@ -35,151 +35,65 @@ EXPORT_DIRS	= $(BUILD_MODULE_DEP_DIRS)
 
 else
 
-#
-# And now for something completely different...
-# Divide the default build into tiers. 
-# Tiers must be defined on module boundaries 
-#
-default: $(SUBMAKEFILES)
-	$(MAKE) tier_0
-	$(MAKE) nspr
-	$(MAKE) ldap
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) freetype
-	$(MAKE) expat
-endif
-	$(MAKE) tier_1
-	$(MAKE) tier_9
-ifdef MOZ_EXTENSIONS
-	$(MAKE) tier_94
-endif
-ifdef MOZ_PSM
-	$(MAKE) tier_95
-endif
-ifdef MOZ_MAIL_NEWS
-	$(MAKE) tier_97
-endif
-ifdef MOZ_CALENDAR
-	$(MAKE) tier_98
-endif
-	$(MAKE) tier_99
-
-# Make sure that the existing rulesets work
-DIRS = \
-	$(tier_0_dirs) \
-	$(tier_1_dirs) \
-	$(tier_9_dirs) \
-	$(NULL)
-
-ifdef GC_LEAK_DETECTOR
-DIRS += gc/boehm
-endif
-
-ifdef MOZ_EXTENSIONS
-DIRS += $(tier_94_dirs)
-endif
-ifdef MOZ_PSM
-DIRS += $(tier_95_dirs)
-endif
-ifdef MOZ_MAIL_NEWS
-DIRS += $(tier_97_dirs)
-endif
-ifdef MOZ_CALENDAR
-DIRS += $(tier_98_dirs)
-endif
-
-DIRS	+= $(tier_99_dirs)
-
-#
-# tier 0 - base build config dirs
-# 
-tier_0_dirs = \
-	config \
-	build \
-	include \
-	$(NULL)
-
-#
-# tier 1 - base libraries
-# 
-tier_1_dirs = js
-
-# MacOSX needs to build lib for MoreFiles before xpcom
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-tier_1_dirs += lib/mac/MoreFiles
-endif
-
-#
-# tier 9 - core components (xpcom,necko,gecko)
-#
-
-# intl should not be in here - it's just temporary until
-# xpconnect's dependency on intl is repaired - see bug 106130
-tier_9_dirs += \
-	modules/libreg \
-	string \
-	xpcom \
-	intl \
-	$(NULL)
-
-ifndef MOZ_NATIVE_ZLIB
-tier_9_dirs	+= modules/zlib
-endif
-
-# Installer needs standalone libjar, hence standalone zlib
-ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
-tier_9_dirs	+= modules/zlib/standalone
-endif
-
-tier_9_dirs	+= \
-	modules/libjar \
-	$(NULL)
+DIRS		= config build
 
 ifdef MOZ_JAVA_SUPPLEMENT
-tier_9_dirs += 			\
+DIRS += 			\
   java/util			\
   java/webclient		\
   $(NULL)
 endif
 
-ifndef MOZ_NATIVE_JPEG
-tier_9_dirs	+= jpeg
+# boehm needs to be built before XPCOM
+ifdef GC_LEAK_DETECTOR
+DIRS += gc/boehm
 endif
 
-tier_9_dirs	+= dbm js/src/xpconnect
+DIRS	+= $(NSPRPUB_DIR)
+
+DIRS		+= dbm modules/libreg js string xpcom js/src/xpconnect
 
 ifdef MOZ_OJI
-tier_9_dirs	+= js/src/liveconnect
+DIRS		+= js/src/liveconnect
 endif
 
 ifdef MOZ_JSDEBUGGER
-tier_9_dirs	+= js/jsd
+DIRS		+= js/jsd
 endif
 
-ifdef MOZ_ENABLE_XFT
-tier_9_dirs	+= other-licenses/Xft
+ifndef MOZ_NATIVE_ZLIB
+DIRS		+= modules/zlib
+endif
+
+ifndef MOZ_NATIVE_JPEG
+DIRS		+= jpeg
 endif
 
 ifdef MOZ_ENABLE_XLIB
-tier_9_dirs	+= gfx/src/xlibrgb widget/src/xlibxtbin
+DIRS           += gfx/src/xlibrgb widget/src/xlibxtbin
 endif
 
 ifdef MOZ_ENABLE_GTK
-tier_9_dirs	+= widget/src/gtksuperwin widget/src/gtkxtbin
+DIRS           += widget/src/gtksuperwin widget/src/gtkxtbin
 endif
 
-ifdef MOZ_INTERNAL_LIBART_LGPL
-tier_9_dirs	+= other-licenses/libart_lgpl
+# Linux and Solaris installer needs standalone libjar, hence standalone zlib
+ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+DIRS		+= modules/zlib/standalone
 endif
 
-tier_9_dirs	+= \
+DIRS		+= \
+		widget/timer \
+		include \
 		modules/libutil \
 		netwerk \
 		modules/mpfilelocprovider \
 		uriloader \
+		intl \
 		modules/libpref \
 		modules/libimg \
 		modules/oji \
+		modules/libjar \
 		caps \
 		rdf \
 		expat \
@@ -204,71 +118,53 @@ tier_9_dirs	+= \
 		$(NULL)
 
 ifdef ACCESSIBILITY
-tier_9_dirs    += accessible
-endif
-
-ifdef MOZ_LDAP_XPCOM
-tier_9_dirs	+= directory/xpcom
+DIRS    += accessible
 endif
 
 # This must preceed xpfe
 ifdef MOZ_JPROF
-tier_9_dirs        += tools/jprof
+DIRS        += tools/jprof
 endif
 
-tier_9_dirs	+= xpfe xpinstall
+DIRS		+= xpfe
 
-ifdef MOZ_LEAKY
-tier_9_dirs        += tools/leaky
-endif
-
-ifdef ENABLE_TESTS
-tier_9_dirs	+= xpcom/tests
-endif
-
-ifdef NS_TRACE_MALLOC
-tier_9_dirs	+= tools/trace-malloc
-endif
-
-tier_9_dirs	+= l10n
-
-#
-# tier 9x - application features
-#
-
-ifdef MOZ_EXTENSIONS
-tier_94_dirs	+= extensions
-endif
+DIRS		+= xpinstall
 
 ifdef MOZ_PSM
-tier_95_dirs	+= security/manager
+DIRS		+= security/manager
+endif
+
+ifdef MOZ_LDAP_XPCOM
+DIRS	+=	directory/c-sdk/ldap directory/xpcom
+endif
+
+ifdef MOZ_EXTENSIONS
+DIRS		+= extensions
 endif
 
 ifdef MOZ_MAIL_NEWS
-tier_97_dirs	+= mailnews
+DIRS		+= mailnews
 endif
 
-ifdef MOZ_CALENDAR
-tier_98_dirs	+= calendar
+ifdef MOZ_LEAKY
+DIRS        += tools/leaky
 endif
 
-#
-# tier 99 - application binaries
-#
+ifdef ENABLE_TESTS
+DIRS		+= xpcom/tests
+endif
+
+DIRS	+= l10n
 
 ifneq (,$(MOZ_STATIC_COMPONENTS)$(MOZ_META_COMPONENTS))
-tier_99_dirs   += modules/staticmod
+DIRS   += modules/staticmod
 endif
 
-tier_99_dirs	+= xpfe/bootstrap
-
-ifdef MOZ_ENABLE_GTK
-tier_99_dirs	+= embedding/browser/gtk/tests
-endif
+DIRS	+= xpfe/bootstrap
 
 endif # BUILD_MODULES == all
 
-STATIC_MAKEFILES := nsprpub directory/c-sdk
+STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
 
 ifdef MOZ_PSM
 STATIC_MAKEFILES += security/nss 
@@ -280,120 +176,12 @@ DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    unallmakefiles \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out 
 
-ifeq ($(BUILD_MODULES),all)
-# Build psuedo-external modules first when export is explicitly called
-export::
-	$(MAKE) -C config export
-	$(MAKE) nspr
-	$(MAKE) ldap
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) freetype
-	$(MAKE) expat
-endif
-
-install::
-ifndef MOZ_NATIVE_NSPR
-	$(MAKE) -C nsprpub real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
-	$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
-	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
-endif
-ifdef MOZ_LDAP_XPCOM
-	$(MAKE) -C directory/c-sdk real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/ldap
-endif
-
-endif
-
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(BUILD_MODULES),all)
-# Clean up after psuedo-external modules
-clean clobber realclean clobber_all distclean::
-ifndef MOZ_NATIVE_NSPR
-	$(MAKE) -C nsprpub $@
-endif
-ifdef MOZ_LDAP_XPCOM
-	$(MAKE) -C directory/c-sdk $@
-endif
-endif
-
-tier_%: 
-	@echo "$@: $($@_dirs)"
-	@$(EXIT_ON_ERROR) \
-		for d in $($@_dirs); do $(UPDATE_TITLE) \
-			$(MAKE) -C $$d export; \
-		done ; \
-		$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include ;\
-		for d in $($@_dirs); do $(UPDATE_TITLE) \
-			$(MAKE) -C $$d libs; \
-		done
-#
-# Individual modules
-#
-boehm:
-ifdef GC_LEAK_DETECTOR
-	$(MAKE) -C gc/boehm
-endif
-
-nspr: boehm
-ifndef MOZ_NATIVE_NSPR
-	$(MAKE) -C nsprpub
-endif
-
-ldap:
-ifdef MOZ_LDAP_XPCOM
-	$(MAKE) -C directory/c-sdk
-endif
-
-freetype:
-ifdef MOZ_ENABLE_XFT
-ifndef MOZ_XFT_SYSTEM_FREETYPE2
-	$(MAKE) -C other-licenses/freetype
-	$(MAKE) -C other-licenses/freetype install
-endif
-endif
-
-expat:
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) -C other-licenses/expat
-	$(MAKE) -C other-licenses/expat install
-endif
-
-# For modules.mk standalone build
 export::
 	+$(LOOP_OVER_EXPORT_DIRS)
 
-export::
-	@$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include
-
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
 	rm -f unallmakefiles $(DIST_GARBAGE)
 
-ifeq ($(OS_ARCH),WINNT)
-rebase:
-ifdef MOZILLA_OFFICIAL
-	echo rebasing $(DIST)
-	/bin/find $(DIST) -name "*.dll" > rebase.lst
-	rebase -b 60000000 -R . -G rebase.lst
-	rm rebase.lst
-endif
-
-splitsymbols:
-ifdef MOZILLA_OFFICIAL
-	echo splitting symbols out of binaries
-	/bin/find $(DIST) -name "*.dll" -exec splitsym {} \;
-	/bin/find $(DIST) -name "*.exe" -exec splitsym {} \;
-	/bin/find $(DIST) -name "*.EXE" -exec splitsym {} \;
-endif # MOZILLA_OFFICIAL
-
-deliver: splitsymbols rebase
-
-endif # WINNT
-
-# Temporary hack for NSS 3.4 landing (bug 116334, wtc@netscape.com)
-ifdef MOZ_PSM
-ifdef COMPILER_DEPEND
-depend::
-	$(MAKE) -C security/manager depend
-endif
-endif

mozilla/README.txt

@@ -1,325 +0,0 @@
-==============================================================
-
-= = = = = = = = = =   Mozilla Read Me    = = = = = = = = = = =
-
-==============================================================
-
-Mozilla is subject to the terms detailed in the license
-agreement accompanying it.
-
-This Read Me file contains information about system
-requirements and installation instructions for the Windows,
-Mac OS, and Linux builds of Mozilla. 
-
-For more info on Mozilla, see www.mozilla.org. To submit bugs
-or other feedback, see the Navigator QA menu and check out
-Bugzilla at http://bugzilla.mozilla.org for links to known
-bugs, bug-writing guidelines, and more. You can also get help
-with Bugzilla by pointing your IRC client to #mozillazine
-at irc.mozilla.org.
-
-
-==============================================================
-
-                      Getting Mozilla
-
-==============================================================
-
-You can download nightly builds of Mozilla from the
-Mozilla.org FTP site at
-
-  ftp://ftp.mozilla.org/pub/mozilla/nightly/
-
-For the very latest builds, see
-
-  ftp://ftp.mozilla.org/pub/mozilla/nightly/latest
-
-Keep in mind that nightly builds, which are used by
-Mozilla.org developers for testing, may be buggy. If you are
-looking for a more polished version of Mozilla, Mozilla.org
-releases Milestone builds of Mozilla every six weeks or so
-that you can download from
-
-  http://www.mozilla.org/releases
- 
-Be sure to read the Mozilla release notes for information
-on known problems and installation issues with Mozilla.
-The release notes can be found at the preceding URL along
-with the milestone releases themselves.
-
-Note: Please use Talkback builds whenever possible. These
-builds allow transmission of crash data back to Mozilla
-developers, improved crash analysis, and posting of crash
-information to our crash-data newsgroup.
-
-
-==============================================================
-
-                    System Requirements
-
-==============================================================
-
-*All Platforms
-
-	To view and use the new streamlined "Modern" theme,
-	your display monitor should be set to display
-	thousands of colors. For users who cannot set their
-	displays to use	more than 256 colors, Mozilla.org
-	recommends using the "Classic" theme for Mozilla.
-
-	To select the Modern theme after you have installed 
-	Mozilla, from the Navigator browser, open the View
-	menu, and then open then open the Apply Theme submenu
-	and choose Modern.
-
-*Mac OS
-
-	-Mac OS 8.6 or later
-	-PowerPC 604e 266 MHz or faster processor, or G3/G4
-	-64 MB RAM
-	-36 MB of free hard disk space
-
-*Windows
-
-	-Windows 9x/Me or Windows NT 4/2000/XP
-	-Intel Pentium-class 233 MHz (or faster) processor
-	-64 MB RAM
-	-26 MB free hard disk space
-
-*Linux
-
-	-Red Hat Linux 6.x or 7 with X11 R6
-	 [Note: Mozilla is certified and fully supported on
-	 Red Hat Linux, but will run on other Linux
-	 distributions, such as Debian 2.1 (or later) or
-	 SuSE 6.2 (or later). The libraries glibc 2.1 (or
-	 higher) and libjpeg.so.62 (or higher) are required.]
-	-Intel Pentium-class 233 MHz (or faster) processor
-	-64MB RAM
-	-26MB free hard disk space
-
-
-==============================================================
-
-                 Installation Instructions
-
-==============================================================
-
-For Mac OS and Windows users, it is strongly recommended that
-you exit all programs before running the setup program. Also,
-you should temporarily disable virus-detection software.
-
-For Linux users, note that the installation instructions use
-the bash shell. If you're not using bash, adjust the commands
-accordingly.
-
-For all platforms, install into a clean (new) directory.
-Installing on top of previously released builds may cause
-problems.
-
-Note: These instructions do not tell you how to build Mozilla.
-For info on building the Mozilla source, see
-
-  http://www.mozilla.org/source.html
-
-
-Windows Installation Instructions
----------------------------------
-
-Note: For Windows NT/2000/XP systems, you need Administrator
-privileges to install Mozilla. If you see an "Error 5" message
-during installation, make sure you're running the installation
-with Administrator privileges.
-
-
-    To install Mozilla by downloading the Mozilla installer,
-    follow these steps:
-	
-	1. Click the the mozilla-win32-installer.exe link on
-	the site you're downloading Mozilla from to download
-	the installer file to your machine.
-	
-	2. Navigate to where you downloaded the file and
-	double-click the Mozilla program icon on your machine
-	to begin the Setup program.
-	
-	3. Follow the on-screen instructions in the setup
-	program. The program starts automatically the first
-	time.
-
-
-    To install Mozilla by downloading the .zip file and
-    installing manually, follow these steps:
-
-	1. Click the mozilla-win32-talkback.zip link or the
-	mozilla-win32.zip link on the site you're down-
-	loading Mozilla from to download the .zip file to
-	your machine.
-
-	2. Navigate to where you downloaded the file and
-	double-click the compressed file.
-
-	Note: This step assumes you already have a recent
-	version of WinZip installed, and that you know how to
-	use it. If not,	you can get WinZip and information
-	about the program at www.winzip.com.
-
-	3. Extract the .zip file to a directory such as
-	C:\Program Files\mozilla.org\Mozilla.
-
-	4. To start Mozilla, navigate to the directory you
-	extracted Mozilla to and double-click the Mozilla.exe
-	icon.
-
-	
-Mac OS Installation Instructions
---------------------------------
-
-Note: If the downloaded file does not expand automatically
-you must expand the file using a program such as StuffIt
-Expander. Expander ships with all new Macs and comes with the
-default system install, so you may want to do a find in
-Sherlock for "StuffIt" to make sure that you don't already
-have it installed.
-
-If you don't have Expander, you can get a copy at the
-following Web site:
-
-  http://www.aladdinsys.com/expander/expander_mac_login.html
-
-If you do already have Expander, you need to set it to start
-by default. See the above URL for info on using Expander.
-
-
-    To install Mozilla by downloading the Mozilla installer,
-    (recommended) follow these steps:
-
-	1. Click the MacMozillaInstaller.sea.bin link on the
-	site you're downloading Mozilla from to	download the
-	file to your Mac's desktop. A MozillaInstaller
-	folder is created.
-	
-	2. Double-click the MozillaInstaller folder in the
-	Finder.
-
-	3. Double-click the Mozilla Installer icon.
-
-	4. Follow the on-screen instructions to complete the
-	installation process.
-
-	5. To start Mozilla, open the folder where you
-	installed Mozilla and double-click the Mozilla icon.
-
-
-    To install Mozilla by downloading the .bin file and
-    installing manually, follow these steps:
-
-	1. Click the mozilla-mac-*.sea.bin link on the site
-	you're downloading Mozilla from to download the
-	Mozilla binary to your Mac's desktop.
-
-	2. Double-click the mozilla-mac-*.sea.sit.bin icon
-	on your desktop.
-
-	3. Choose the directory where you want to install
-	Mozilla.
-
-	4. To start Mozilla, open the folder where you
-	installed Mozilla and double-click the Mozilla icon.
-
-
-Linux Installation Instructions
--------------------------------
-
-Note: If you install in the default directory (which is
-usually /usr/local/mozilla), or any other directory where
-only the root user normally has write-access, you must
-start Mozilla first as root before other users can start
-the program. Doing so generates a set of files required
-for later use by other users.
-
-
-    To install Mozilla by downloading the Mozilla installer,
-    follow these steps:
-
-	1. Create a directory named mozilla (mkdir mozilla)
-	and change to that directory (cd mozilla).
-	
-	2. Click the link on the site you're downloading
-	Mozilla from to download the installer file
-	(called mozilla-1686-pc-linux-gnu-installer.tar.gz)
-	to your machine.
-
-	3. Change to the mozilla directory (cd mozilla) and
-	decompress the archive with the following command:
-
-	  tar zxvf moz*.tar.gz
-
-	The installer is now located in a subdirectory of
-	Mozilla	named mozilla-installer.
-
-	4. Change to the mozilla-installer directory
-	(cd mozilla-installer) and run the installer with the
-	./mozilla-installer command.
-
- 	5. Follow the instructions in the install wizard for
-	installing Mozilla.
-
-	Note: If you have a slower machine, be aware that the
-	installation may take some time. In this case, the
-	installation progress may appear to hang indefinitely,
-	even though the installation is still in process.
-
-	6. To start Mozilla, change to the directory where you
-	installed it and run the ./mozilla command.
-
-
-    To install Mozilla by downloading the tar.gz file:
-
-	1. Create a directory named "mozilla" (mkdir mozilla)
-	and change to that directory (cd mozilla).
-
-	2. Click the link on the site you're downloading
-	Mozilla from to download the non-installer
-	(mozilla*.tar.gz) file into the mozilla directory.
-
-	3. Change to the mozilla directory (cd mozilla) and
-	decompress the file with the following command:
-
-	  tar zxvf moz*.tar.gz
- 	
-	This creates a "mozilla" directory under your mozilla
-	directory. 
-
-	4. Change to the mozilla directory (cd mozilla). 
-
-	5. Run Mozilla with the following run script: 
-
-	  ./mozilla
-
-
-    To hook up Mozilla complete with icon to the GNOME Panel,
-    follow these steps:
-
-	1. Click the GNOME Main Menu button, open the Panel menu,
-	and then open the Add to Panel submenu and choose Launcher.
-
-	2. Right-click the icon for Mozilla on the Panel and
-	enter the following command:
-	  directory_name./mozilla
-
-	where directory_name is the name of the directory
-	you downloaded mozilla to. For example, the default
-	directory that Mozilla suggests is /usr/local/mozilla.
-
-	3. Type in a name for the icon, and type in a comment
-	if you wish.
-
-	4. Click the icon button and type in the following as
-	the icon's location:
-
-	  directory_name/icons/mozicon50.xpm
-
-	where directory name is the directory where you
-	installed Mozilla. For example, the default directory
-	is /usr/local/mozilla/icons/mozicon50.xpm.

mozilla/accessible/build/Makefile.in

@@ -16,7 +16,7 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): John Gaunt (jgaunt@netscape.com)
+# Contributor(s): 
 #
 
 DEPTH		= ../..
@@ -29,39 +29,28 @@ 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
-REQUIRES = \
-    xpcom \
-    string \
-    dom \
-		  $(NULL)
+REQUIRES	= xpcom string dom
 
 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) \
+    $(DIST)/lib/libaccessibility_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)    \
+    -L$(DIST)/lib            \
+    $(EXTRA_DSO_LIBS)        \
+    -lgkgfx                  \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/accessible/build/makefile.win

@@ -17,39 +17,30 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): John Gaunt (jgaunt@netscape.com)
+# Contributor(s): 
 
 DEPTH=..\..
 MODULE=accessibility
-REQUIRES = \
-  xpcom \
-  string \
-  dom \
-  $(NULL)
 LIBRARY_NAME=accessibility
 MODULE_NAME=nsAccessibilityModule
 
-include <$(DEPTH)\config\config.mak>
-
 CPP_OBJS=\
-  .\$(OBJDIR)\nsAccessibilityFactory.obj \
+  .\$(OBJDIR)\nsAccessibilityFactory.obj    \
   $(NULL)
 
 LINCS = $(LINCS) -I..\src         # for implementation headers
 
 SUB_LIBRARIES=\
-  $(DIST)\lib\accessibility_base_s.lib \
-  $(DIST)\lib\accessibility_html_s.lib \
-!ifdef MOZ_XUL
-  $(DIST)\lib\accessibility_xul_s.lib \
-!endif
+  $(DIST)\lib\accessibility_s.lib           \
   $(NULL)
 
 LLIBS=\
-  $(DIST)\lib\xpcom.lib \
-  $(DIST)\lib\gkgfx.lib \
-  $(DIST)\lib\contentshared_s.lib \
-  $(LIBNSPR) \
+  $(DIST)\lib\xpcom.lib                     \
+  $(DIST)\lib\timer_s.lib                   \
+  $(DIST)\lib\gkgfx.lib                  \
+  $(DIST)\lib\contentshared_s.lib           \
+  $(LIBNSPR)                                \
   $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
+

mozilla/accessible/build/nsAccessibilityFactory.cpp

@@ -1,40 +1,24 @@
-/* -*- 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
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsCOMPtr.h"
 #include "nsIModule.h"
@@ -63,7 +47,7 @@ NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aRes
 }
 
 // The list of components we register
-static const nsModuleComponentInfo components[] = 
+static nsModuleComponentInfo components[] = 
 {
     { "AccessibilityService", 
       NS_ACCESSIBILITY_SERVICE_CID,

mozilla/accessible/public/Makefile.in

@@ -36,8 +36,10 @@ XPIDLSRCS = \
       nsIAccessibleEventReceiver.idl \
       nsIAccessibleEventListener.idl \
       nsIAccessibleSelectable.idl    \
-      nsIAccessibleProvider.idl \
       $(NULL)
 
+EXPORTS = \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
 

mozilla/accessible/public/makefile.win

@@ -30,7 +30,6 @@ XPIDLSRCS =               \
   .\nsIAccessibleEventReceiver.idl \
   .\nsIAccessibleEventListener.idl \
   .\nsIAccessibleSelectable.idl \
-  .\nsIAccessibleProvider.idl \
   $(NULL)
 
 EXPORTS = \

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -33,55 +33,23 @@ interface nsIWeakReference;
 [scriptable, uuid(68D9720A-0984-42b6-A3F5-8237ED925727)]
 interface nsIAccessibilityService : nsISupports
 {
-  nsIAccessible createAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
-  nsIAccessible createIFrameAccessible(in nsIDOMNode aNode);
   nsIAccessible createRootAccessible(in nsISupports aPresContext, in nsISupports aFrame);
-
-  nsIAccessible createHTML4ButtonAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLAreaAccessible(in nsIWeakReference aPresShell, in nsIDOMNode aDOMNode, in nsIAccessible aAccParent);
-  nsIAccessible createHTMLBlockAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
-  nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLComboboxAccessible(in nsIDOMNode aNode, in nsISupports aPresShell);
-  nsIAccessible createHTMLGroupboxAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLImageAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLListboxAccessible(in nsIDOMNode aNode, in nsISupports aPresShell);
-// new
-//  nsIAccessible CreateHTMLObjectAccessible(in nsISupports aFrame);
-// end new
-  nsIAccessible createHTMLRadioButtonAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLSelectOptionAccessible(in nsIDOMNode aNode, in nsIAccessible aAccParent, in nsISupports aPresShell);
+  nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLRadioButtonAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
+  nsIAccessible createHTML4ButtonAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLTextAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLImageAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLAreaAccessible(in nsIWeakReference aPresShell, in nsIDOMNode aDOMNode, in nsIAccessible aAccParent);
   nsIAccessible createHTMLTableAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLTableCellAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLTextAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLTextFieldAccessible(in nsISupports aFrame);
-
-  nsIAccessible createXULButtonAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULCheckboxAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULColorPickerAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULColorPickerTileAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULComboboxAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULDropmarkerAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULGroupboxAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULImageAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULListboxAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULListitemAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULMenubarAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULMenuitemAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULMenupopupAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULMenuSeparatorAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULProgressMeterAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULStatusBarAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULRadioButtonAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULRadioGroupAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULSelectOptionAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULSelectListAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULTabAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULTabBoxAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULTabPanelsAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULTabsAccessible(in nsIDOMNode aNode);
-  nsIAccessible createXULTextAccessible(in nsIDOMNode aNode);
-
+  nsIAccessible createHTMLIFrameAccessible(in nsIDOMNode aNode, in nsISupports aPresContext);
+  nsIAccessible createHTMLBlockAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
+  nsIAccessible createAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
   nsIAccessible getAccessibleFor(in nsIDOMNode aNode);
 };
 

mozilla/accessible/public/nsIAccessible.idl

@@ -73,9 +73,6 @@ interface nsIAccessible : nsISupports
 
   nsIDOMNode accGetDOMNode();
 
-  // Used by Accessible implementation to save data and speed up accessibility tree walking
-  [noscript] void CacheOptimizations(in nsIAccessible aParent, in PRInt32 aSiblingIndex, in nsIDOMNodeList aSiblingList);
-
  // MSAA State flags - used for bitfield. More than 1 allowed.
   const unsigned long  STATE_UNAVAILABLE        = 0x00000001;  // Disabled, maps to opposite of Java ENABLED, Gnome/ATK SENSITIVE?
   const unsigned long  STATE_SELECTED           = 0x00000002;
@@ -189,5 +186,4 @@ interface nsIAccessible : nsISupports
   const unsigned long  ROLE_CLOCK               = 0x0000003D;
   const unsigned long  ROLE_SPLITBUTTON         = 0x0000003E;   // New in MSAA 2.0 
   const unsigned long  ROLE_IPADDRESS           = 0x0000003F;   // New in MSAA 2.0 
-  const unsigned long  ROLE_NOTHING             = 0xffffffff;
 };

mozilla/accessible/public/nsIAccessibleEventListener.idl

@@ -36,10 +36,6 @@ interface nsIAccessibleEventListener : nsISupports
   const unsigned long EVENT_SELECTION_ADD      = 0x8007;
   const unsigned long EVENT_SELECTION_REMOVE   = 0x8008;
   const unsigned long EVENT_SELECTION_WITHIN   = 0x8009;
-  const unsigned long EVENT_MENUSTART          = 0x0004;
-  const unsigned long EVENT_MENUEND            = 0x0005;
-  const unsigned long EVENT_MENUPOPUPSTART     = 0x0006;
-  const unsigned long EVENT_MENUPOPUPEND       = 0x0007;
 
   void handleEvent(in unsigned long aEvent, in nsIAccessible aTarget);
 };

mozilla/accessible/public/nsIAccessibleEventReceiver.idl

@@ -28,5 +28,5 @@
 interface nsIAccessibleEventReceiver : nsISupports
 {
   void addAccessibleEventListener(in nsIAccessibleEventListener aListener);
-  void removeAccessibleEventListener();
+  void removeAccessibleEventListener(in nsIAccessibleEventListener aListener);
 };

mozilla/accessible/public/nsIAccessibleProvider.idl

@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- * 
- * 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 the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: John Gaunt (jgaunt@netscape.com)
- * 
- * Contributor(s): 
- * John Gaunt
- */
-
-#include "nsISupports.idl"
-#include "nsIAccessible.idl"
-
-[scriptable, uuid(3f0e3eb0-1dd2-11b2-9605-be5b8e76cf4b)]
-interface nsIAccessibleProvider : nsISupports
-{
-	readonly attribute nsIAccessible accessible;
-};

mozilla/accessible/src/MANIFEST

@@ -0,0 +1 @@
+accessible.properties

mozilla/accessible/src/Makefile.in

@@ -16,24 +16,43 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): John Gaunt (jgaunt@netscape.com)
+# Contributor(s): 
 #
 
-DEPTH = ../..
+DEPTH   = ../..
 topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-  base \
-  html \
-  $(null)
+MODULE    = accessibility
+LIBRARY_NAME  = accessibility_s
+REQUIRES  = xpcom string layout widget dom view locale intl docshell webshell necko htmlparser xuldoc imglib2 gfx2
 
-ifdef MOZ_XUL
-DIRS +=   xul
-endif
+CPPSRCS   = \
+    nsAccessible.cpp \
+    nsAccessibilityService.cpp \
+    nsRootAccessible.cpp \
+    nsHTMLIFrameRootAccessible.cpp \
+    nsHTMLFormControlAccessible.cpp \
+    nsHTMLTextAccessible.cpp \
+    nsHTMLTableAccessible.cpp \
+    nsHTMLImageAccessible.cpp \
+    nsHTMLAreaAccessible.cpp \
+    nsHTMLLinkAccessible.cpp \
+    nsHTMLSelectListAccessible.cpp \
+    nsHTMLComboboxAccessible.cpp \
+    nsHTMLListboxAccessible.cpp \
+    nsGenericAccessible.cpp \
+    $(NULL)
+
+EXPORTS = \
+  nsRootAccessible.h \
+  $(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/accessible/src/accessible.properties

@@ -0,0 +1,5 @@
+jump    =       Jump
+press   =       Press
+check   =       Check
+uncheck =       Uncheck
+select  =       Select

mozilla/accessible/src/base/Makefile.in

@@ -1,77 +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_base_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  locale \
-  necko \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  xuldoc \
-  webbrwsr \
-  $(NULL)
-
-CPPSRCS = \
-  nsAccessibilityService.cpp \
-  nsAccessible.cpp \
-  nsBaseWidgetAccessible.cpp \
-  nsFormControlAccessible.cpp \
-  nsGenericAccessible.cpp \
-  nsRootAccessible.cpp \
-  nsSelectAccessible.cpp \
-  $(NULL)
-
-EXPORTS = \
-  nsRootAccessible.h \
-  $(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES += \
-  -I$(srcdir) \
-  -I$(srcdir)/../html \
-  -I$(srcdir)/../xul \
-  $(NULL)

mozilla/accessible/src/base/accessible.properties

@@ -3,6 +3,3 @@ press   =       Press
 check   =       Check
 uncheck =       Uncheck
 select  =       Select
-open    =       Open
-close   =       Close
-switch  =       Switch

mozilla/accessible/src/base/jar.mn

@@ -1,3 +1,3 @@
-en-win.jar:
-	locale/en-US/global-platform/accessible.properties
+en-US.jar:
+	locale/en-US/global/accessible.properties
 

mozilla/accessible/src/base/makefile.win

@@ -1,77 +0,0 @@
-#!gmake
-#
-# 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 = ..\..\..
-MODULE = accessibility
-LIBRARY_NAME = accessibility_base_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  intl \
-  layout \
-  locale \
-  necko \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  $(NULL)
-
-
-CPP_OBJS = \
-  .\$(OBJDIR)\nsAccessibilityService.obj \
-  .\$(OBJDIR)\nsAccessible.obj \
-  .\$(OBJDIR)\nsBaseWidgetAccessible.obj \
-  .\$(OBJDIR)\nsFormControlAccessible.obj \
-  .\$(OBJDIR)\nsGenericAccessible.obj \
-  .\$(OBJDIR)\nsRootAccessible.obj \
-  .\$(OBJDIR)\nsSelectAccessible.obj \
-  $(NULL)
-
-EXPORTS = \
-  .\nsRootAccessible.h \
-  $(NULL)
-
-LINCS = \
-  -I..\html \
-  -I..\xul \
-  -I..\..\..\layout\html\forms\public \
-  -I..\..\..\layout\html\forms\src \
-  -I..\..\..\layout\html\base\src \
-  $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-
-
-

mozilla/accessible/src/base/nsAccessibilityService.h

@@ -1,40 +1,27 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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.
+ * 
  *
  * Original Author: David W. Hyatt (hyatt@netscape.com)
- * Contributor(s):  John Gaunt (jgaunt@netscape.com)
  *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef __nsAccessibilityService_h__
 #define __nsAccessibilityService_h__
@@ -51,19 +38,22 @@ class nsIDOMNode;
 class nsAccessibilityService : public nsIAccessibilityService
 {
 public:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
   NS_DECL_ISUPPORTS
 
   // nsIAccessibilityService methods:
   NS_DECL_NSIACCESSIBILITYSERVICE
 
+  // nsAccessibilityService methods:
+  nsAccessibilityService();
+  virtual ~nsAccessibilityService();
+
+public:
+
 private:
-  nsresult GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aContent);
-  nsresult GetShellFromNode(nsIDOMNode *aNode, nsIWeakReference **weakShell);
+  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aContent);
   void GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent);
   nsIContent* FindContentForDocShell(nsIPresShell* aPresShell, nsIContent* aContent, nsIDocShell*  aDocShell);
+
 };
 
-#endif /* __nsIAccessibilityService_h__ */
+#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/base/nsAccessible.h

@@ -1,80 +1,51 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsAccessible_H_
 #define _nsAccessible_H_
 
-#include "nsCOMPtr.h"
+#include "nsISupports.h"
 #include "nsGenericAccessible.h"
-#include "nsIAccessible.h"
-#include "nsIAccessibilityService.h"
+#include "nsCOMPtr.h"
+#include "nsIContent.h"
 #include "nsIDOMNode.h"
-#include "nsIFocusController.h"
-#include "nsIPresContext.h"
 #include "nsIPresShell.h"
-#include "nsPoint.h"
-#include "nsRect.h"
+#include "nsIPresContext.h"
 #include "nsWeakReference.h"
-#include "nsIDOMNodeList.h"
-#include "nsIBindingManager.h"
+#include "nsIFocusController.h"
+#include "nsRect.h"
+#include "nsPoint.h"
 
-#define ACCESSIBLE_BUNDLE_URL "chrome://global-platform/locale/accessible.properties"
+#define ACCESSIBLE_BUNDLE_URL "chrome://global/locale/accessible.properties"
 
-class nsIContent;
-class nsIDocShell;
 class nsIFrame;
+class nsIDocShell;
 class nsIWebShell;
-
-enum { eSiblingsUninitialized = -1, eSiblingsWalkNormalDOM = -2};  // Used in sibling index field as flags
+class nsIContent;
 
 class nsAccessible : public nsGenericAccessible
 {
 public:
-  // to eliminate the confusion of "magic numbers" -- if ( 0 ){ foo; }
-  enum { eAction_Switch=0, eAction_Jump=0, eAction_Click=0 };
-  // how many actions
-  enum { eNo_Action=0, eSingle_Action=1 };
-
-  nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  virtual ~nsAccessible();
-
-  NS_IMETHOD GetAccName(nsAString& _retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
   NS_IMETHOD GetAccParent(nsIAccessible **_retval); 
   NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval); 
   NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); 
@@ -90,79 +61,95 @@ public:
   NS_IMETHOD AccTakeFocus(void); 
   NS_IMETHOD AccGetDOMNode(nsIDOMNode **_retval); 
 
+  public:
+    nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+    virtual ~nsAccessible();
+
+    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
+
+    // Helper Routines for Sub-Docs
+    static nsresult GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
+    static nsresult GetDocShellObjects(nsIDocShell*     aDocShell,
+                                nsIPresShell**   aPresShell, 
+                                nsIPresContext** aPresContext, 
+                                nsIContent**     aContent);
+    static nsresult GetDocShells(nsIPresShell* aPresShell,
+                          nsIDocShell** aDocShell,
+                          nsIDocShell** aParentDocShell);
+    static nsresult GetParentPresShellAndContent(nsIPresShell*  aPresShell,
+                                          nsIPresShell** aParentPresShell,
+                                          nsIContent**   aSubShellContent);
+
+    static PRBool FindContentForWebShell(nsIPresShell* aParentPresShell,
+                                  nsIContent*   aParentContent,
+                                  nsIWebShell*  aWebShell,
+                                  nsIContent**  aFoundContent);
+    nsresult CalcOffset(nsIFrame* aFrame,
+                        nsIPresContext * aPresContext,
+                        nsRect& aRect);
+    nsresult GetAbsPosition(nsIPresShell* aPresShell, nsPoint& aPoint);
+    nsresult GetAbsoluteFramePosition(nsIPresContext* aPresContext,
+                                      nsIFrame *aFrame, 
+                                      nsRect& aAbsoluteTwipsRect, 
+                                      nsRect& aAbsolutePixelRect);
+    static nsresult GetTranslatedString(PRUnichar *aKey, nsAWritableString *aStringOut);
+
+    // helper method to verify frames
+    static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom);
+
 protected:
   virtual nsIFrame* GetFrame();
   virtual nsIFrame* GetBoundsFrame();
   virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
   virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  PRBool IsPartiallyVisible(); 
-  NS_IMETHOD AppendLabelText(nsIDOMNode *aLabelNode, nsAString& _retval);
-  NS_IMETHOD AppendLabelFor(nsIContent *aLookNode, const nsAString *aId, nsAString *aLabel);
-  NS_IMETHOD GetHTMLAccName(nsAString& _retval);
-  NS_IMETHOD GetXULAccName(nsAString& _retval);
-  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAString *aFlatString);
-  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAString *aFlatString);
-  NS_IMETHOD AppendStringWithSpaces(nsAString *aFlatString, const nsAString& textEquivalent);
-  NS_IMETHOD GetFocusedElement(nsIDOMElement **aFocusedElement);
-  NS_IMETHOD CacheOptimizations(nsIAccessible *aParent, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList);
-  // helper method to verify frames
-  static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom);
-  static nsresult GetTranslatedString(const nsAString& aKey, nsAString& aStringOut);
-  void GetScrollOffset(nsRect *aRect);
-  void GetScreenOrigin(nsIPresContext *aPresContext, nsIFrame *aFrame, nsRect *aRect);
+  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString);
+  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString);
 
   // Data Members
   nsCOMPtr<nsIDOMNode> mDOMNode;
   nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIDOMNodeList> mSiblingList; // If some of our computed siblings are anonymous content nodes, cache node list
-  PRInt32 mSiblingIndex; // Cache where we are in list of kids that we got from nsIBindingManager::GetContentList(parentContent)
+  nsCOMPtr<nsIFocusController> mFocusController;
+
 };
 
-
-/** This class is used to walk the DOM tree. It skips
-  * everything but nodes that either implement nsIAccessible
-  * or have primary frames that implement "GetAccessible"
-  */
-
-struct WalkState {
-  nsCOMPtr<nsIAccessible> accessible;
-  nsCOMPtr<nsIDOMNode> domNode;
-  nsCOMPtr<nsIDOMNodeList> siblingList;
-  PRInt32 siblingIndex;  // Holds a state flag or an index into the siblingList
-  WalkState *prevState;
-};
-
- 
-class nsAccessibleTreeWalker {
+/* Special Accessible that knows how to handle hit detection for flowing text */
+class nsHTMLBlockAccessible : public nsAccessible
+{
 public:
-  nsAccessibleTreeWalker(nsIWeakReference* aShell, nsIDOMNode* aContent, 
-    PRInt32 aCachedSiblingIndex, nsIDOMNodeList *aCachedSiblingList, PRBool mWalkAnonymousContent);
-  ~nsAccessibleTreeWalker();
-
-  NS_IMETHOD GetNextSibling();
-  NS_IMETHOD GetPreviousSibling();
-  NS_IMETHOD GetParent();
-  NS_IMETHOD GetFirstChild();
-  NS_IMETHOD GetLastChild();
-  PRInt32 GetChildCount();
-  WalkState mState;
-
-protected:
-  NS_IMETHOD GetChildBefore(nsIDOMNode* aParent, nsIDOMNode* aChild);
-  PRBool IsHidden();
-  PRBool GetAccessible();
-  NS_IMETHOD GetFullTreeParentNode(nsIDOMNode *aChildNode, nsIDOMNode **aParentNodeOut);
-  void GetSiblings(nsIDOMNode *aOneOfTheSiblings);
-  void GetKids(nsIDOMNode *aParent);
-
-  void ClearState();
-  NS_IMETHOD PushState();
-  NS_IMETHOD PopState();
-
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIAccessibilityService> mAccService;
-  nsCOMPtr<nsIBindingManager> mBindingManager;
+   nsHTMLBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
 };
 
+/* Leaf version of DOM Accessible
+ * has no children
+ */
+class nsLeafAccessible : public nsAccessible
+{
+  public:
+    nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+
+    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+};
+
+
+class nsLinkableAccessible : public nsAccessible
+{
+  public:
+    nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+    NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+    NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+    NS_IMETHOD AccDoAction(PRUint8 index);
+    NS_IMETHOD GetAccState(PRUint32 *_retval);
+    NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+
+  protected:
+    PRBool IsALink();
+    PRBool mIsALinkCached;  // -1 = unknown, 0 = not a link, 1 = is a link
+    nsCOMPtr<nsIContent> mLinkContent;
+    PRBool mIsLinkVisited;
+};
+
+
 #endif  

mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp

@@ -1,425 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- *          John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 "nsAccessible.h"
-#include "nsBaseWidgetAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsGUIEvent.h"
-#include "nsIContent.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsIFrame.h"
-#include "nsILink.h"
-#include "nsIPresContext.h"
-#include "nsIPresShell.h"
-#include "nsISelection.h"
-#include "nsISelectionController.h"
-
-// ------------
-// nsBlockAccessible
-// ------------
-
-nsBlockAccessible::nsBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):nsAccessible(aNode, aShell)
-{
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  // We're going to find the child that contains coordinates (tx,ty)
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);  // Get bounds for this accessible
-  if (tx >= x && tx < x + w && ty >= y && ty < y + h)
-  {
-    // It's within this nsIAccessible, let's drill down
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> smallestChild;
-    PRInt32 smallestArea = -1;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;  // Child bounds
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      // ok if there are multiple frames the contain the point 
-      // and they overlap then pick the smallest. We need to do this
-      // for text frames.
-      
-      // For example, A point that's in block #2 is also in block #1, but we want to return #2:
-      //
-      // [[block #1 is long wrapped text that continues to
-      // another line]]  [[here is a shorter block #2]]
-
-      if (tx >= cx && tx < cx + cw && ty >= cy && ty < cy + ch) 
-      {
-        if (smallestArea == -1 || cw*ch < smallestArea) {
-          smallestArea = cw*ch;
-          smallestChild = child;
-        }
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-    if (smallestChild != nsnull)
-    {
-      *_retval = smallestChild;
-      NS_ADDREF(*_retval);
-      return NS_OK;
-    }
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * nsContainerAccessible
-  */
-nsContainerAccessible::nsContainerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{
-}
-
-/** no actions */
-NS_IMETHODIMP nsContainerAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eNo_Action;
-  return NS_OK;
-}
-
-/** no actions */
-NS_IMETHODIMP nsContainerAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  return NS_OK;
-}
-
-/** no actions */
-NS_IMETHODIMP nsContainerAccessible::AccDoAction(PRUint8 index)
-{
-  return NS_OK;
-}
-
-/** no state -- normal */
-NS_IMETHODIMP nsContainerAccessible::GetAccState(PRUint32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-
-/** no value */
-NS_IMETHODIMP nsContainerAccessible::GetAccValue(nsAString& _retval)
-{
-  return NS_OK;
-}
-
-/** no name*/
-NS_IMETHODIMP nsContainerAccessible::GetAccName(nsAString& _retval)
-{
-  return NS_OK;
-}
-
-
-//-------------
-// nsLeafFrameAccessible
-//-------------
-
-nsLeafAccessible::nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsLeafAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsLeafAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsLeafAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-
-
-//----------------
-// nsLinkableAccessible
-//----------------
-
-nsLinkableAccessible::nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell), mIsALinkCached(PR_FALSE), mLinkContent(nsnull), mIsLinkVisited(PR_FALSE)
-{ 
-}
-
-/* long GetAccState (); */
-NS_IMETHODIMP nsLinkableAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsAccessible::GetAccState(_retval);
-  *_retval |= STATE_READONLY | STATE_SELECTABLE;
-  if (IsALink()) {
-    *_retval |= STATE_LINKED;
-    if (mIsLinkVisited)
-      *_retval |= STATE_TRAVERSED;
-  }
-  
-  // Get current selection and find out if current node is in it
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  if (!shell) {
-     return NS_ERROR_FAILURE;  
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  shell->GetPresContext(getter_AddRefs(context));
-  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-  nsIFrame *frame = nsnull;
-  if (content && NS_SUCCEEDED(shell->GetPrimaryFrameFor(content, &frame)) && frame) {
-    nsCOMPtr<nsISelectionController> selCon;
-    frame->GetSelectionController(context,getter_AddRefs(selCon));
-    if (selCon) {
-      nsCOMPtr<nsISelection> domSel;
-      selCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSel));
-      if (domSel) {
-        PRBool isSelected = PR_FALSE, isCollapsed = PR_TRUE;
-        domSel->ContainsNode(mDOMNode, PR_TRUE, &isSelected);
-        domSel->GetIsCollapsed(&isCollapsed);
-        if (isSelected && !isCollapsed)
-          *_retval |=STATE_SELECTED;
-      }
-    }
-  }
-
-  if (IsALink()) {
-    // Make sure we also include all the states of the parent link, such as focusable, focused, etc.
-    PRUint32 role;
-    GetAccRole(&role);
-    if (role != ROLE_LINK) {
-      nsCOMPtr<nsIAccessible> parentAccessible;
-      GetAccParent(getter_AddRefs(parentAccessible));
-      if (parentAccessible) {
-        PRUint32 orState = 0;
-        parentAccessible->GetAccState(&orState);
-        *_retval |= orState;
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAString& _retval)
-{
-  if (IsALink()) {
-    nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mLinkContent));
-    if (elt) 
-      return elt->GetAttribute(NS_LITERAL_STRING("href"), _retval);
-  }
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-/* PRUint8 getAccNumActions (); */
-NS_IMETHODIMP nsLinkableAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eSingle_Action;
-  return NS_OK;
-}
-
-/* wstring getAccActionName (in PRUint8 index); */
-NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  // Action 0 (default action): Jump to link
-  if (index == eAction_Jump) {   
-    if (IsALink()) {
-      nsAccessible::GetTranslatedString(NS_LITERAL_STRING("jump"), _retval); 
-      return NS_OK;
-    }
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/* void accDoAction (in PRUint8 index); */
-NS_IMETHODIMP nsLinkableAccessible::AccDoAction(PRUint8 index)
-{
-  // Action 0 (default action): Jump to link
-  if (index == 0) {
-    if (IsALink()) {
-      nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-      if (!shell) {
-        return NS_ERROR_FAILURE;  
-      }
-
-      nsCOMPtr<nsIPresContext> presContext;
-      shell->GetPresContext(getter_AddRefs(presContext));
-      if (presContext) {
-        nsMouseEvent linkClickEvent;
-        linkClickEvent.eventStructType = NS_EVENT;
-        linkClickEvent.message = NS_MOUSE_LEFT_CLICK;
-        linkClickEvent.isShift = PR_FALSE;
-        linkClickEvent.isControl = PR_FALSE;
-        linkClickEvent.isAlt = PR_FALSE;
-        linkClickEvent.isMeta = PR_FALSE;
-        linkClickEvent.clickCount = 0;
-        linkClickEvent.widget = nsnull;
-
-        nsEventStatus eventStatus =  nsEventStatus_eIgnore;
-        mLinkContent->HandleDOMEvent(presContext, 
-                                     &linkClickEvent, 
-                                     nsnull, 
-                                     NS_EVENT_FLAG_INIT, 
-                                     &eventStatus);
-        return NS_OK;
-      }
-    }
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-
-PRBool nsLinkableAccessible::IsALink()
-{
-  if (mIsALinkCached)  // Cached answer?
-    return mLinkContent? PR_TRUE: PR_FALSE;
-
-  nsCOMPtr<nsIContent> walkUpContent(do_QueryInterface(mDOMNode));
-  if (walkUpContent) {
-    nsCOMPtr<nsIContent> tempContent = walkUpContent;
-    while (walkUpContent) {
-      nsCOMPtr<nsILink> link(do_QueryInterface(walkUpContent));
-      if (link) {
-        mLinkContent = tempContent;
-        mIsALinkCached = PR_TRUE;
-        nsLinkState linkState;
-        link->GetLinkState(linkState);
-        if (linkState == eLinkState_Visited)
-          mIsLinkVisited = PR_TRUE;
-        return PR_TRUE;
-      }
-      walkUpContent->GetParent(*getter_AddRefs(tempContent));
-      walkUpContent = tempContent;
-    }
-  }
-  mIsALinkCached = PR_TRUE;  // Cached that there is no link
-  return PR_FALSE;
-}
-
-// ------------
-// nsMenuListenerAccessible
-// ------------
-
-NS_IMPL_ISUPPORTS_INHERITED1(nsMenuListenerAccessible, nsAccessible, nsIDOMXULListener)
-
-nsMenuListenerAccessible::nsMenuListenerAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsAccessible(aDOMNode, aShell)
-{
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-nsMenuListenerAccessible::~nsMenuListenerAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsMenuListenerAccessible::PopupShowing(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsMenuListenerAccessible::PopupHiding(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsMenuListenerAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-void
-nsMenuListenerAccessible::SetupMenuListener()
-{
-  // if not already one, register ourselves as a popup listener
-  if (!mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
-     if (!eventReceiver) {
-       return;
-     }
-
-     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE);   
-
-     if (NS_FAILED(rv)) {
-       return;
-     }
-
-     mRegistered = PR_TRUE;
-  }
-}
-

mozilla/accessible/src/base/nsBaseWidgetAccessible.h

@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- *       John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef _nsBaseWidgetAccessible_H_
-#define _nsBaseWidgetAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMXULListener.h"
-
-/**
-  * This file contains a number of classes that are used as base
-  *  classes for the different accessibility implementations of
-  *  the HTML and XUL widget sets.  --jgaunt
-  */
-
-/**
-  * Special Accessible that knows how to handle hit detection for flowing text
-  */
-class nsBlockAccessible : public nsAccessible
-{
-public:
-  nsBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-};
-
-/**
-  * Special Accessible that just contains other accessible objects
-  *   no actions, no name, no state, no value
-  */
-class nsContainerAccessible : public nsAccessible
-{
-public:
-  nsContainerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-};
-
-/** 
-  * Leaf version of DOM Accessible -- has no children
-  */
-class nsLeafAccessible : public nsAccessible
-{
-public:
-  nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-/**
-  * A type of accessible for DOM nodes containing an href="" attribute.
-  *  It knows how to report the state of the link ( traveled or not )
-  *  and can activate ( click ) the link programmatically.
-  */
-class nsLinkableAccessible : public nsAccessible
-{
-public:
-  nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-
-protected:
-  PRBool IsALink();
-  PRBool mIsALinkCached;  // -1 = unknown, 0 = not a link, 1 = is a link
-  nsCOMPtr<nsIContent> mLinkContent;
-  PRBool mIsLinkVisited;
-};
-
-/*
- * A base class that can listen to menu events. Its used by selects so the 
- * button and the window accessibles can change their name and role
- * depending on whether the drop down list is dropped down on not
- */
-class nsMenuListenerAccessible  : public nsAccessible, public nsIDOMXULListener
-{
-public:
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsMenuListenerAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsMenuListenerAccessible();
-
-  // popup listener
-  NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent);
-  NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent);
-  NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }
-  
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  virtual void SetupMenuListener();
-
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-#endif  
-

mozilla/accessible/src/base/nsFormControlAccessible.cpp

@@ -1,226 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- *     John Gaunt (jgaunt@netscape.com)
- *     Aaron Leventhal (aaronl@netscape.com)
- *
- * 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 ***** */
-
-// NOTE: alphabetically ordered
-#include "nsFormControlAccessible.h"
-#include "nsIDocument.h"
-#include "nsIDOMHTMLFormElement.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMHTMLLabelElement.h"
-#include "nsIDOMNodeList.h"
-#include "nsIDOMXULButtonElement.h"
-#include "nsIDOMXULCheckboxElement.h"
-#include "nsIDOMXULDocument.h"
-#include "nsIDOMXULElement.h"
-#include "nsIDOMXULLabelElement.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-#include "nsReadableUtils.h"
-#include "nsString.h"
-
-/**
-  * nsFormControlAccessible
-  */
-
-nsFormControlAccessible::nsFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * XUL states: focused, unavailable(disabled), focusable, ?protected?
-  * HTML states: focused, unabailable(disabled), focusable, protected
-  */
-NS_IMETHODIMP nsFormControlAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get the focused state from the nsAccessible
-  nsAccessible::GetAccState(_retval);
-
-  PRBool disabled = PR_FALSE;
-  nsresult rv = NS_ERROR_FAILURE;
-  nsCOMPtr<nsIDOMHTMLInputElement> htmlFormElement(do_QueryInterface(mDOMNode, &rv));
-  if (NS_SUCCEEDED(rv) && htmlFormElement) {
-    htmlFormElement->GetDisabled(&disabled);
-    nsAutoString typeString;
-    htmlFormElement->GetType(typeString);
-    if (typeString.EqualsIgnoreCase("password"))
-      *_retval |= STATE_PROTECTED;
-  }
-  else {
-    nsCOMPtr<nsIDOMXULControlElement> xulFormElement(do_QueryInterface(mDOMNode, &rv));  
-    if (NS_SUCCEEDED(rv) && xulFormElement) {
-      xulFormElement->GetDisabled(&disabled);
-      /* XXX jgaunt do XUL elements support password fields? */
-    }
-  }
-  if (disabled)
-    *_retval |= STATE_UNAVAILABLE;
-  else 
-    *_retval |= STATE_FOCUSABLE;
-
-  return NS_OK;
-}
-
-/**
-  * Will be called by both HTML and XUL elements, this method
-  *  merely checks who is calling and then calls the appropriate
-  *  protected method for the XUL or HTML element.
-  */
-NS_IMETHODIMP nsFormControlAccessible::GetAccName(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMXULElement> xulFormElement(do_QueryInterface(mDOMNode));
-  if (xulFormElement)
-    return GetXULAccName(_retval);
-  else
-    return GetHTMLAccName(_retval);
-}
-
-/**
-  * No Children
-  */
-NS_IMETHODIMP nsFormControlAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * No Children
-  */
-NS_IMETHODIMP nsFormControlAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * No Children
-  */
-NS_IMETHODIMP nsFormControlAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-
-// ------------
-// Radio button
-// ------------
-
-nsRadioButtonAccessible::nsRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  *
-  */
-NS_IMETHODIMP nsRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eSingle_Action;
-  return NS_OK;
-}
-
-/**
-  *
-  */
-NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("select"), _retval); 
-    return NS_OK;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  *
-  */
-NS_IMETHODIMP nsRadioButtonAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_RADIOBUTTON;
-
-  return NS_OK;
-}
-
-// ------------
-// Text Accessibles
-// ------------
-
-nsTextAccessible::nsTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell)
-{ 
-}
-
-/**
-  * We are text
-  */
-NS_IMETHODIMP nsTextAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_TEXT;
-
-  return NS_OK;
-}
-
-/**
-  * No Children
-  */
-NS_IMETHODIMP nsTextAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * No Children
-  */
-NS_IMETHODIMP nsTextAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * No Children
-  */
-NS_IMETHODIMP nsTextAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-

mozilla/accessible/src/base/nsFormControlAccessible.h

@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: Eric D Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef _nsFormControlAccessible_H_
-#define _nsFormControlAccessible_H_
-
-#include "nsBaseWidgetAccessible.h"
-
-/**
-  * This supports name and state information for both XUL and HTML
-  *   widgets. Designed to be a base class for the impls of XUL
-  *   and HTML form widget Accessibles
-  */
-class nsFormControlAccessible : public nsAccessible
-{
-public:
-  nsFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-};
-
-/**
-  *
-  */
-class nsRadioButtonAccessible : public nsFormControlAccessible
-{
-
-public:
-  nsRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-};
-
-/**
-  * Text nodes have no children, but since double inheritance
-  *  no-worky we have to re-impl the LeafAccessiblity blocks 
-  *  this way.
-  */
-class nsTextAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-
-#endif
-

mozilla/accessible/src/base/nsGenericAccessible.cpp

@@ -1,45 +1,31 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Eric Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsGenericAccessible.h"
+#include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIWeakReference.h"
+#include "nsISelectionController.h"
 #include "nsReadableUtils.h"
 #include "nsIContent.h"
 
@@ -94,25 +80,25 @@ NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
 }
 
 /* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAWritableString& _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAWritableString& _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAString& name)
+NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAReadableString& name)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAString& _retval)
+NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAWritableString& _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -136,7 +122,7 @@ NS_IMETHODIMP nsGenericAccessible::GetAccNumActions(PRUint8 *_retval)
 }
 
 /* wstring getAccActionName (in PRUint8 index); */
-NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -154,7 +140,7 @@ NS_IMETHODIMP nsGenericAccessible::GetAccFocused(nsIAccessible **_retval)
 }
 
 /* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAString& _retval)
+NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAWritableString& _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -236,7 +222,4 @@ NS_IMETHODIMP nsGenericAccessible::AccGetDOMNode(nsIDOMNode **_retval)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsGenericAccessible::CacheOptimizations(nsIAccessible *aParent, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
+

mozilla/accessible/src/base/nsGenericAccessible.h

@@ -1,41 +1,25 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Eric D Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsGenericAccessible_H_
 #define _nsGenericAccessible_H_

mozilla/accessible/src/base/nsRootAccessible.cpp

@@ -1,55 +1,36 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsIAccessible.h"
 #include "nsRootAccessible.h"
 #include "nsCOMPtr.h"
 #include "nsIDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
 #include "nsIContent.h"
 #include "nsIFrame.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMElement.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMEventReceiver.h"
-#include "nsIDOMEventListener.h"
 #include "nsReadableUtils.h"
 #include "nsILink.h"
 #include "nsHTMLFormControlAccessible.h"
@@ -57,7 +38,6 @@
 #include "nsIURI.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsIWebNavigation.h"
 #include "nsIXULDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentType.h"
@@ -69,22 +49,14 @@
 #include "nsXPIDLString.h"
 #include "nsIAccessibilityService.h"
 #include "nsIServiceManager.h"
-#include "nsHTMLSelectAccessible.h"
+#include "nsHTMLSelectListAccessible.h"
 #include "nsIDOMHTMLSelectElement.h"
-#include "nsCURILoader.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
 
 NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
   NS_INTERFACE_MAP_ENTRY(nsIAccessibleDocument)
   NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
   NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
   NS_INTERFACE_MAP_ENTRY(nsIDOMFormListener)
-  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-  NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
-  NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) 
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormListener)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener)
 NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
@@ -93,31 +65,20 @@ NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
 NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
 NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
 
-nsIDOMNode * nsRootAccessible::gLastFocusedNode = 0; // Strong reference
-
-PRUint32 nsRootAccessible::gInstanceCount = 0;
-
-//#define DEBUG_LEAKS 1 // aaronl debug
-
-
 //-----------------------------------------------------
 // construction 
 //-----------------------------------------------------
 nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell):nsAccessible(nsnull,aShell), 
-  nsDocAccessibleMixin(aShell), mAccService(do_GetService("@mozilla.org/accessibilityService;1")),
-  mBusy(eBusyStateUninitialized)
+  nsDocAccessibleMixin(aShell), mAccService(do_GetService("@mozilla.org/accessibilityService;1"))
 {
   mListener = nsnull;
   nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  if (shell) {
-    shell->GetDocument(getter_AddRefs(mDocument));
-    mDOMNode = do_QueryInterface(mDocument);
-  }
+  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
+
+  shell->GetDocument(getter_AddRefs(mDocument));
+  mDOMNode = do_QueryInterface(mDocument);
+
   nsLayoutAtoms::AddRefAtoms();
-  ++gInstanceCount;
-#ifdef DEBUG_LEAKS
-  printf("=====> %d nsRootAccessible's %x\n", gInstanceCount, (PRUint32)this); 
-#endif
 }
 
 //-----------------------------------------------------
@@ -125,18 +86,12 @@ nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell):nsAccessible(nsnull
 //-----------------------------------------------------
 nsRootAccessible::~nsRootAccessible()
 {
-  if (--gInstanceCount == 0) 
-    NS_IF_RELEASE(gLastFocusedNode);
-#ifdef DEBUG_LEAKS
-  printf("======> %d nsRootAccessible's %x\n", gInstanceCount, (PRUint32)this); 
-#endif
-
   nsLayoutAtoms::ReleaseAtoms();
-  RemoveAccessibleEventListener();
+  RemoveAccessibleEventListener(mListener);
 }
 
   /* attribute wstring accName; */
-NS_IMETHODIMP nsRootAccessible::GetAccName(nsAString& aAccName) 
+NS_IMETHODIMP nsRootAccessible::GetAccName(nsAWritableString& aAccName) 
 { 
   return GetTitle(aAccName);
 }
@@ -145,6 +100,8 @@ NS_IMETHODIMP nsRootAccessible::GetAccName(nsAString& aAccName)
 nsIFrame* nsRootAccessible::GetFrame()
 {
   nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell)
+    return nsnull;
 
   nsIFrame* root = nsnull;
   if (shell) 
@@ -156,8 +113,7 @@ nsIFrame* nsRootAccessible::GetFrame()
 void nsRootAccessible::GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame)
 {
   *aRelativeFrame = GetFrame();
-  if (*aRelativeFrame)
-    (*aRelativeFrame)->GetRect(aBounds);
+  (*aRelativeFrame)->GetRect(aBounds);
 }
 
 /* readonly attribute nsIAccessible accParent; */
@@ -178,7 +134,7 @@ NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUint32 *aAccRole)
 
   /*
   // Commenting this out for now.
-  // It was requested that we always use MSAA ROLE_PANE objects instead of client objects.
+  // It was requested that we always use pane objects instead of client objects.
   // However, it might be asked that we put client objects back.
 
   nsCOMPtr<nsIPresContext> context; 
@@ -201,167 +157,88 @@ NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUint32 *aAccRole)
   */
 
   *aAccRole = ROLE_PANE;
-
-  // If it's a <dialog>, use ROLE_DIALOG instead
-  nsCOMPtr<nsIContent> rootContent;
-  mDocument->GetRootContent(getter_AddRefs(rootContent));
-  if (rootContent) {
-    nsCOMPtr<nsIDOMElement> rootElement(do_QueryInterface(rootContent));
-    if (rootElement) {
-      nsAutoString name;
-      rootElement->GetLocalName(name);
-      if (name.Equals(NS_LITERAL_STRING("dialog"))) 
-        *aAccRole = ROLE_DIALOG;
-    }
-  }
-
-  return NS_OK;
+  return NS_OK;  
 }
 
 NS_IMETHODIMP nsRootAccessible::GetAccState(PRUint32 *aAccState)
 {
-  *aAccState = STATE_FOCUSABLE;
-  if (mBusy == eBusyStateLoading)
-    *aAccState |= STATE_BUSY;
-  return NS_OK;
+  return nsDocAccessibleMixin::GetAccState(aAccState);
 }
 
-NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAString& aAccValue)
+
+NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAWritableString& aAccValue)
 {
   return GetURL(aAccValue);
 }
 
-void nsRootAccessible::Notify(nsITimer *timer)
-{
-  // Short timer is finished 
-  if (mBusy != eBusyStateDone) {
-    mBusy = eBusyStateDone;
-    if (mListener)
-      mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, this);
-  }
-}
-
-void nsRootAccessible::StartDocReadyTimer()
-{
-  if (!mTimer) {
-    nsresult rv;
-    mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
-    if (NS_SUCCEEDED(rv)) {
-      const PRUint32 kUpdateTimerDelay = 1;
-      mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kUpdateTimerDelay);
-    }
-  }
-}
-
 /* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
 NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
 {
-  NS_ASSERTION(aListener, "Trying to add a null listener!");
-  if (mListener)
-    return NS_OK;
+  if (!mListener)
+  {
+    // add an event listener to the document
+    nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+    if (!shell)
+      return NS_ERROR_FAILURE;
 
+    nsCOMPtr<nsIDocument> document;
+    shell->GetDocument(getter_AddRefs(document));
+
+    // use AddEventListener from the nsIDOMEventTarget interface
+    nsCOMPtr<nsIDOMEventTarget> target;
+    if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventTarget), getter_AddRefs(target))) && target)
+    {
+      nsresult rv = NS_OK;
+      // we're a DOMEventListener now!!
+      nsCOMPtr<nsIDOMEventListener> listener;
+      rv = this->QueryInterface( NS_GET_IID(nsIDOMEventListener), getter_AddRefs(listener) );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to QI");
+      // capture DOM focus events 
+      rv = target->AddEventListener( NS_LITERAL_STRING("focus") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+      // capture Form change events 
+      rv = target->AddEventListener( NS_LITERAL_STRING("change") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+      // add ourself as a CheckboxStateChange listener ( custom event fired in nsHTMLInputElement.cpp )
+      rv = target->AddEventListener( NS_LITERAL_STRING("CheckboxStateChange") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+      // add ourself as a RadiobuttonStateChange listener ( custom event fired in nsHTMLInputElement.cpp )
+      rv = target->AddEventListener( NS_LITERAL_STRING("RadiobuttonStateChange") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+    }
+  }
+
+  // create a weak reference to the listener
   mListener =  aListener;
 
-  // use AddEventListener from the nsIDOMEventTarget interface
-  nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(mDocument));
-  if (target) { 
-    // capture DOM focus events 
-    nsresult rv = target->AddEventListener(NS_LITERAL_STRING("focus"), NS_STATIC_CAST(nsIDOMFocusListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    // capture Form change events 
-    rv = target->AddEventListener(NS_LITERAL_STRING("change"), NS_STATIC_CAST(nsIDOMFormListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    // add ourself as a CheckboxStateChange listener (custom event fired in nsHTMLInputElement.cpp)
-    rv = target->AddEventListener(NS_LITERAL_STRING("CheckboxStateChange"), NS_STATIC_CAST(nsIDOMFormListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    // add ourself as a RadioStateChange Listener ( custom event fired in in nsHTMLInputElement.cpp  & radio.xml)
-    rv = target->AddEventListener(NS_LITERAL_STRING("RadioStateChange"), NS_STATIC_CAST(nsIDOMFormListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    rv = target->AddEventListener(NS_LITERAL_STRING("ListitemStateChange"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    rv = target->AddEventListener(NS_LITERAL_STRING("popupshowing"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    rv = target->AddEventListener(NS_LITERAL_STRING("popuphiding"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-
-    rv = target->AddEventListener(NS_LITERAL_STRING("DOMMenuItemActive"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-    
-    // Extremely short timer, after which we announce that page is finished loading
-    // By waiting until after this short time, we know that the 3rd party accessibility software 
-    // has received it's accessible, and can handle events on it.
-    StartDocReadyTimer(); 
-
-    // Set up web progress listener - we need to know when page loading is finished
-    // That way we can send the STATE_CHANGE events for the MSAA root "pane" object (ROLE_PANE),
-    // and change the STATE_BUSY bit flag
-    nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mPresShell));
-    if (presShell) {
-      nsCOMPtr<nsIPresContext> context; 
-      presShell->GetPresContext(getter_AddRefs(context));
-      if (context) { 
-        nsCOMPtr<nsISupports> container; context->GetContainer(getter_AddRefs(container));
-        nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
-        if (docShell) {
-          mWebProgress = do_GetInterface(docShell);
-          mWebProgress->AddProgressListener(this, nsIWebProgress::NOTIFY_LOCATION | 
-                                                  nsIWebProgress::NOTIFY_STATE_DOCUMENT);
-        }
-      }
-    }
-    NS_ASSERTION(mWebProgress, "Could not get nsIWebProgress for nsRootAccessible");
-  }
-
   return NS_OK;
 }
 
-/* void removeAccessibleEventListener (); */
-NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener()
+/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
 {
-  if (mListener) {
-    nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(mDocument));
-    if (target) { 
-      target->RemoveEventListener(NS_LITERAL_STRING("focus"), NS_STATIC_CAST(nsIDOMFocusListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("change"), NS_STATIC_CAST(nsIDOMFormListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("CheckboxStateChange"), NS_STATIC_CAST(nsIDOMFormListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("popupshowing"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("popuphiding"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("DOMMenuItemActive"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("RadioStateChange"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-      target->RemoveEventListener(NS_LITERAL_STRING("ListitemStateChange"), NS_STATIC_CAST(nsIDOMXULListener*, this), PR_TRUE);
-    }
- 
-    if (mTimer) {
-      mTimer->Cancel();
-      mTimer = nsnull;
-    }
+  if (mListener)
+  {
+     nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+     nsCOMPtr<nsIDocument> document;
+     if (!shell)
+       return NS_OK;
 
-    if (mWebProgress) {
-      mWebProgress->RemoveProgressListener(this);
-      mWebProgress = nsnull;
-    }
-    mListener = nsnull;
+     shell->GetDocument(getter_AddRefs(document));
+
+     nsCOMPtr<nsIDOMEventReceiver> erP;
+     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
+     {
+        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+     }
   }
 
+  mListener = nsnull;
+
   return NS_OK;
 }
 
-void nsRootAccessible::FireAccessibleFocusEvent(nsIAccessible *focusAccessible, nsIDOMNode *focusNode)
-{
-  if (focusNode && gLastFocusedNode != focusNode) {
-    mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, focusAccessible);
-    NS_IF_RELEASE(gLastFocusedNode);
-    gLastFocusedNode = focusNode;
-    NS_ADDREF(gLastFocusedNode);
-  }
-}
-
 // --------------- nsIDOMEventListener Methods (3) ------------------------
 
 NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
@@ -376,15 +253,7 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
     // Check to see if it's a select element. If so, need the currently focused option
     nsCOMPtr<nsIDOMHTMLSelectElement> selectElement(do_QueryInterface(targetNode));
     if (selectElement)     // ----- Target Node is an HTML <select> element ------
-      nsHTMLSelectOptionAccessible::GetFocusedOptionNode(targetNode, optionTargetNode);
-
-    // for focus events on Radio Groups we give the focus to the selected button
-    nsCOMPtr<nsIDOMXULSelectControlElement> selectControl(do_QueryInterface(targetNode));
-    if (selectControl) {
-      nsCOMPtr<nsIDOMXULSelectControlItemElement> selectItem;
-      selectControl->GetSelectedItem(getter_AddRefs(selectItem));
-      optionTargetNode = do_QueryInterface(selectItem);
-    }
+      nsHTMLSelectOptionAccessible::GetFocusedOptionNode(mPresShell, targetNode, optionTargetNode);
 
     nsAutoString eventType;
     aEvent->GetType(eventType);
@@ -392,40 +261,30 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
     nsCOMPtr<nsIAccessible> accessible;
 
     if (NS_SUCCEEDED(mAccService->GetAccessibleFor(targetNode, getter_AddRefs(accessible)))) {
-      if (eventType.EqualsIgnoreCase("focus") || eventType.EqualsIgnoreCase("DOMMenuItemActive")) { 
-        if (optionTargetNode &&
-            NS_SUCCEEDED(mAccService->GetAccessibleFor(optionTargetNode, getter_AddRefs(accessible)))) {
-          FireAccessibleFocusEvent(accessible, optionTargetNode);
-        }
-        else
-          FireAccessibleFocusEvent(accessible, targetNode);
-      }
-      else if (eventType.EqualsIgnoreCase("change")) {
-        if (!selectControl)   // Don't use onchange to fire EVENT_STATE_CHANGE events for selects
-          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
-      }
-      else if (eventType.EqualsIgnoreCase("ListitemStateChange")) {
-        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
-        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
-      }
-      else if (eventType.EqualsIgnoreCase("CheckboxStateChange")) { 
-        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
-      }
-      else if (eventType.EqualsIgnoreCase("RadioStateChange") ) {
-        // first the XUL radio buttons
-        if (targetNode &&
-            NS_SUCCEEDED(mAccService->GetAccessibleFor(targetNode, getter_AddRefs(accessible)))) {
-          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      if ( eventType.EqualsIgnoreCase("focus") ) {
+        if (mCurrentFocus != targetNode) {
           mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
-        }
-        else { // for the html radio buttons -- apparently the focus code just works. :-)
-          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+          mCurrentFocus = targetNode;
         }
       }
-      else if (eventType.EqualsIgnoreCase("popupshowing")) 
-        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_MENUPOPUPSTART, accessible);
-      else if (eventType.EqualsIgnoreCase("popuphiding")) 
-        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_MENUPOPUPEND, accessible);
+      else if ( eventType.EqualsIgnoreCase("change") ) {
+        if (optionTargetNode) {   // Set to current option only for HTML selects
+          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_SELECTION, accessible);
+          if (mCurrentFocus != optionTargetNode &&
+            NS_SUCCEEDED(mAccService->GetAccessibleFor(optionTargetNode, getter_AddRefs(accessible)))) {
+              mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
+              mCurrentFocus = optionTargetNode;
+          }
+        }
+        else 
+          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      }
+      else if ( eventType.EqualsIgnoreCase("CheckboxStateChange") ) {
+        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      }
+      else if ( eventType.EqualsIgnoreCase("RadiobuttonStateChange") ) {
+        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      }
     }
   }
   return NS_OK;
@@ -434,11 +293,7 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
 NS_IMETHODIMP nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsCOMPtr<nsIDOMNode>& aTargetNode)
 {
   nsCOMPtr<nsIDOMEventTarget> domEventTarget;
-  nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
-
-  if (nsevent) {
-    nsevent->GetOriginalTarget(getter_AddRefs(domEventTarget));
-  }
+  aEvent->GetOriginalTarget(getter_AddRefs(domEventTarget));
 
   nsresult rv;
   aTargetNode = do_QueryInterface(domEventTarget, &rv);
@@ -477,47 +332,29 @@ NS_IMETHODIMP nsRootAccessible::Select(nsIDOMEvent* aEvent) { return NS_OK; }
 // gets Input events when text is entered or deleted in a textarea or input
 NS_IMETHODIMP nsRootAccessible::Input(nsIDOMEvent* aEvent) { return NS_OK; }
 
-// ------- nsIDOMXULListener Methods (8) ---------------
-
-NS_IMETHODIMP nsRootAccessible::PopupShowing(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::PopupHiding(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::Close(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::Command(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-
-NS_IMETHODIMP nsRootAccessible::CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-
 // ------- nsIAccessibleDocument Methods (5) ---------------
 
-NS_IMETHODIMP nsRootAccessible::GetURL(nsAString& aURL)
+NS_IMETHODIMP nsRootAccessible::GetURL(nsAWritableString& aURL)
 {
   return nsDocAccessibleMixin::GetURL(aURL);
 }
 
-NS_IMETHODIMP nsRootAccessible::GetTitle(nsAString& aTitle)
+NS_IMETHODIMP nsRootAccessible::GetTitle(nsAWritableString& aTitle)
 {
   return nsDocAccessibleMixin::GetTitle(aTitle);
 }
 
-NS_IMETHODIMP nsRootAccessible::GetMimeType(nsAString& aMimeType)
+NS_IMETHODIMP nsRootAccessible::GetMimeType(nsAWritableString& aMimeType)
 {
   return nsDocAccessibleMixin::GetMimeType(aMimeType);
 }
 
-NS_IMETHODIMP nsRootAccessible::GetDocType(nsAString& aDocType)
+NS_IMETHODIMP nsRootAccessible::GetDocType(nsAWritableString& aDocType)
 {
   return nsDocAccessibleMixin::GetDocType(aDocType);
 }
 
-NS_IMETHODIMP nsRootAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAString& aNameSpaceURI)
+NS_IMETHODIMP nsRootAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
 {
   return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI);
 }
@@ -527,50 +364,6 @@ NS_IMETHODIMP nsRootAccessible::GetDocument(nsIDocument **doc)
   return nsDocAccessibleMixin::GetDocument(doc);
 }
 
-NS_IMETHODIMP nsRootAccessible::OnStateChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, PRUint32 aStateFlags, nsresult aStatus)
-{
-  return NS_OK;
-}
-
-/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
-NS_IMETHODIMP nsRootAccessible::OnProgressChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress,
-  PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress)
-{
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
-  return NS_OK;
-}
-
-/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
-NS_IMETHODIMP nsRootAccessible::OnLocationChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, nsIURI *location)
-{
-  // Load has been verified, it will occur, about to commence
-  if (mListener && mBusy != eBusyStateLoading) {
-    mBusy = eBusyStateLoading; 
-    mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, this);
-    StartDocReadyTimer(); 
-  }
-
-  return NS_OK;
-}
-
-/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
-NS_IMETHODIMP nsRootAccessible::OnStatusChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, nsresult aStatus, const PRUnichar *aMessage)
-{
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
-  return NS_OK;
-}
-
-/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */
-NS_IMETHODIMP nsRootAccessible::OnSecurityChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, PRUint32 state)
-{
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
-  return NS_OK;
-}
 
 nsDocAccessibleMixin::nsDocAccessibleMixin(nsIDocument *aDoc):mDocument(aDoc)
 {
@@ -579,54 +372,41 @@ nsDocAccessibleMixin::nsDocAccessibleMixin(nsIDocument *aDoc):mDocument(aDoc)
 nsDocAccessibleMixin::nsDocAccessibleMixin(nsIWeakReference *aPresShell)
 {
   nsCOMPtr<nsIPresShell> shell(do_QueryReferent(aPresShell));
-  if (shell)
-    shell->GetDocument(getter_AddRefs(mDocument));
+  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
+  shell->GetDocument(getter_AddRefs(mDocument));
 }
 
 nsDocAccessibleMixin::~nsDocAccessibleMixin()
 {
 }
 
-NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAString& aURL)
+NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAWritableString& aURL)
 { 
-  nsCOMPtr<nsIPresShell> presShell;
-  mDocument->GetShellAt(0, getter_AddRefs(presShell));
-  if (!presShell)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIDocShell> docShell;
-  GetDocShellFromPS(presShell, getter_AddRefs(docShell));
-
-  nsCOMPtr<nsIWebNavigation> webNav(do_GetInterface(docShell));
-  nsCAutoString theURL;
-  if (webNav) {
-    nsCOMPtr<nsIURI> pURI;
-    webNav->GetCurrentURI(getter_AddRefs(pURI));
-    if (pURI) 
-      pURI->GetSpec(theURL);
-  }
-  //XXXaaronl Need to use CopyUTF8toUCS2(nsDependentCString(theURL), aURL); when it's written
-  aURL.Assign(NS_ConvertUTF8toUCS2(theURL)); 
+  nsCOMPtr<nsIURI> pURI;
+  mDocument->GetDocumentURL(getter_AddRefs(pURI));
+  nsXPIDLCString path;
+  pURI->GetSpec(getter_Copies(path));
+  aURL.Assign(NS_ConvertUTF8toUCS2(path).get());
+  //XXXaaronl Need to use CopyUTF8toUCS2(nsDependentCString(path), aURL); when it's written
+  
   return NS_OK;
 }
 
-NS_IMETHODIMP nsDocAccessibleMixin::GetTitle(nsAString& aTitle)
+NS_IMETHODIMP nsDocAccessibleMixin::GetTitle(nsAWritableString& aTitle)
 {
   // This doesn't leak - we don't own the const pointer that's returned
   aTitle = *(mDocument->GetDocumentTitle());
   return NS_OK;
 }
 
-NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAString& aMimeType)
+NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAWritableString& aMimeType)
 {
-  nsCOMPtr<nsIDOMNSDocument> domnsDocument(do_QueryInterface(mDocument));
-  if (domnsDocument) {
-    return domnsDocument->GetContentType(aMimeType);
-  }
+  if (mDocument)
+    return mDocument->GetContentType(aMimeType); 
   return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAString& aDocType)
+NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAWritableString& aDocType)
 {
   nsCOMPtr<nsIXULDocument> xulDoc(do_QueryInterface(mDocument));
   nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(mDocument));
@@ -643,7 +423,7 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAString& aDocType)
   return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsDocAccessibleMixin::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAString& aNameSpaceURI)
+NS_IMETHODIMP nsDocAccessibleMixin::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
 {
   if (mDocument) {
     nsCOMPtr<nsINameSpaceManager> nameSpaceManager;
@@ -653,6 +433,7 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetNameSpaceURIForID(PRInt16 aNameSpaceID, n
   return NS_ERROR_FAILURE;
 }
 
+
 NS_IMETHODIMP nsDocAccessibleMixin::GetDocument(nsIDocument **doc)
 {
   *doc = mDocument;
@@ -663,22 +444,35 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetDocument(nsIDocument **doc)
   return NS_ERROR_FAILURE;
 }
 
-
-NS_IMETHODIMP nsDocAccessibleMixin::GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell)
+NS_IMETHODIMP nsDocAccessibleMixin::GetAccState(PRUint32 *aAccState)
 {
-  *aDocShell = nsnull;
-  if (aPresShell) {
-    nsCOMPtr<nsIDocument> doc;
-    aPresShell->GetDocument(getter_AddRefs(doc));
-    if (doc) {
-      nsCOMPtr<nsIScriptGlobalObject> scriptObj;
-      doc->GetScriptGlobalObject(getter_AddRefs(scriptObj));
-      if (scriptObj) {
-        scriptObj->GetDocShell(aDocShell);
-        if (*aDocShell)
-          return NS_OK;
+  // Screen readers need to know when the document is finished loading (STATE_BUSY flag)
+  // We do it this way, rather than via nsIWebProgressListener, because
+  // if accessibility was turned on after a document already finished loading, 
+  // we would get no state changes from nsIWebProgressListener.
+  // The GetBusyFlags method, however, always has the current busy state information for us.
+
+  *aAccState = 0;
+  if (mDocument) {
+    nsCOMPtr<nsIPresShell> presShell;
+    mDocument->GetShellAt(0, getter_AddRefs(presShell));
+    if (presShell) {
+      nsCOMPtr<nsIPresContext> context; 
+      presShell->GetPresContext(getter_AddRefs(context));
+      if (context) {
+        nsCOMPtr<nsISupports> container;
+        context->GetContainer(getter_AddRefs(container));
+        if (container) {
+          nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
+          if (docShell) {
+            PRUint32 busyFlags;
+            docShell->GetBusyFlags(&busyFlags);
+            if (busyFlags != nsIDocShell::BUSY_FLAGS_NONE)
+              *aAccState = nsIAccessible::STATE_BUSY;
+          }
+        }
       }
     }
   }
-  return NS_ERROR_FAILURE;
+  return NS_OK;
 }

mozilla/accessible/src/base/nsRootAccessible.h

@@ -1,40 +1,24 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsRootAccessible_H_
 #define _nsRootAccessible_H_
@@ -44,16 +28,9 @@
 #include "nsIAccessibleEventListener.h"
 #include "nsIAccessibleDocument.h"
 #include "nsIDOMFormListener.h"
-#include "nsIDOMXULListener.h"
 #include "nsIDOMFocusListener.h"
 #include "nsIDocument.h"
 #include "nsIAccessibilityService.h"
-#include "nsIWebProgressListener.h"
-#include "nsIWeakReference.h"
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "nsIWebProgress.h"
-
 
 class nsDocAccessibleMixin
 {
@@ -61,11 +38,12 @@ class nsDocAccessibleMixin
     nsDocAccessibleMixin(nsIDocument *doc);
     nsDocAccessibleMixin(nsIWeakReference *aShell);
     virtual ~nsDocAccessibleMixin();
-    
+
     NS_DECL_NSIACCESSIBLEDOCUMENT
 
+    NS_IMETHOD GetAccState(PRUint32 *aAccState);
+
   protected:
-    NS_IMETHOD GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
     nsCOMPtr<nsIDocument> mDocument;
 };
 
@@ -74,35 +52,29 @@ class nsRootAccessible : public nsAccessible,
                          public nsIAccessibleDocument,
                          public nsIAccessibleEventReceiver,
                          public nsIDOMFocusListener,
-                         public nsIDOMFormListener,
-                         public nsIDOMXULListener,
-                         public nsIWebProgressListener,
-                         public nsITimerCallback, 
-                         public nsSupportsWeakReference
-
+                         public nsIDOMFormListener
 
 {
   NS_DECL_ISUPPORTS_INHERITED
 
   public:
-    enum EBusyState {eBusyStateUninitialized, eBusyStateLoading, eBusyStateDone};
-
     nsRootAccessible(nsIWeakReference* aShell);
     virtual ~nsRootAccessible();
 
     /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(nsAString& aAccName);
-    NS_IMETHOD GetAccValue(nsAString& aAccValue);
+    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
+    NS_IMETHOD GetAccValue(nsAWritableString& aAccValue);
     NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
     NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
     NS_IMETHOD GetAccState(PRUint32 *aAccState);
 
     // ----- nsIAccessibleEventReceiver -------------------
+
     NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener();
+    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
 
     // ----- nsIDOMEventListener --------------------------
-    NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
+    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
 
     // ----- nsIDOMFocusListener --------------------------
     NS_IMETHOD Focus(nsIDOMEvent* aEvent);
@@ -115,41 +87,19 @@ class nsRootAccessible : public nsAccessible,
     NS_IMETHOD Select(nsIDOMEvent* aEvent);
     NS_IMETHOD Input(nsIDOMEvent* aEvent);
 
-    NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent);
-    NS_IMETHOD PopupShown(nsIDOMEvent* aEvent);
-    NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent);
-    NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent);
-    NS_IMETHOD Close(nsIDOMEvent* aEvent);
-    NS_IMETHOD Command(nsIDOMEvent* aEvent);
-    NS_IMETHOD Broadcast(nsIDOMEvent* aEvent);
-    NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent);
-
-    NS_IMETHOD_(void) Notify(nsITimer *timer);
-
     NS_DECL_NSIACCESSIBLEDOCUMENT
-    NS_DECL_NSIWEBPROGRESSLISTENER
 
   protected:
     NS_IMETHOD GetTargetNode(nsIDOMEvent *aEvent, nsCOMPtr<nsIDOMNode>& aTargetNode);
     virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
     virtual nsIFrame* GetFrame();
-    void FireAccessibleFocusEvent(nsIAccessible *focusAccessible, nsIDOMNode *focusNode);
-    void StartDocReadyTimer();
 
-    static PRUint32 gInstanceCount;
-
-    // mListener is not a com pointer. We don't own the listener
+    // not a com pointer. We don't own the listener
     // it is the callers responsibility to remove the listener
     // otherwise we will get into circular referencing problems
-    // We don't need a weak reference, because we're owned by this listener
-    nsIAccessibleEventListener *mListener;
-
-    static nsIDOMNode * gLastFocusedNode; // we do our own refcounting for this
-
-    nsCOMPtr<nsITimer> mTimer;
-    nsCOMPtr<nsIWebProgress> mWebProgress;
+    nsIAccessibleEventListener* mListener;
+    nsCOMPtr<nsIDOMNode> mCurrentFocus;
     nsCOMPtr<nsIAccessibilityService> mAccService;
-    EBusyState mBusy;
 };
 
 

mozilla/accessible/src/base/nsSelectAccessible.cpp

@@ -1,743 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s):  John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 "nsFormControlAccessible.h"
-#include "nsIAtom.h"
-#include "nsIComboboxControlFrame.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsIDOMHTMLCollection.h"
-#include "nsIDOMHTMLOptionElement.h"
-#include "nsIDOMHTMLOptGroupElement.h"
-#include "nsIDOMText.h"
-#include "nsIDOMHTMLSelectElement.h"
-#include "nsIFrame.h"
-#include "nsIListControlFrame.h"
-#include "nsISelectControlFrame.h"
-#include "nsLayoutAtoms.h"
-#include "nsRootAccessible.h"
-#include "nsSelectAccessible.h"
-#include "nsIServiceManager.h"
-
-/** ------------------------------------------------------ */
-/**  First, the common widgets                             */
-/** ------------------------------------------------------ */
-
-/** Constructor -- cache our parent */
-nsSelectListAccessible::nsSelectListAccessible(nsIAccessible* aParent, 
-                                                       nsIDOMNode* aDOMNode, 
-                                                       nsIWeakReference* aShell)
-:nsAccessible(aDOMNode, aShell)
-{
-  mParent = aParent;
-}
-
-/** Return our parents bounds */
-NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return mParent->AccGetBounds(x,y,width,height);
-}
-
-/** Return our cached parent */
-NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-  *_retval = mParent;
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-/** We are a list */
-NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LIST;
-  return NS_OK;
-}
-
-/** We are an only child */
-NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/** We are an only child */
-NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * nsSelectOptionAccessible
-  */
-
-/** Constructor -- cache our parent  */
-nsSelectOptionAccessible::nsSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsLeafAccessible(aDOMNode, aShell)
-{
-  if (aParent)
-    mParent = aParent;
-  else {
-    nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-    nsCOMPtr<nsIDOMNode> parentNode, parentNode1;
-    nsCOMPtr<nsIAccessible> parentAccessible, lastChildAcc;
-    aDOMNode->GetParentNode(getter_AddRefs(parentNode));
-    if (parentNode) {
-      // this parent could be a Combobox or a ListBox. Each has a different
-      // was to get to the ListElement. 
-        nsCOMPtr<nsIDOMHTMLOptGroupElement> optGroupElement(do_QueryInterface(parentNode));
-        if (optGroupElement) {
-          parentNode->GetParentNode(getter_AddRefs(parentNode1));
-          parentNode = parentNode1;
-        }
-        accService->GetAccessibleFor(parentNode, getter_AddRefs(parentAccessible));
-        PRUint32 role;
-        do {
-          parentAccessible->GetAccLastChild(getter_AddRefs(lastChildAcc));
-          if (lastChildAcc)
-            lastChildAcc->GetAccRole(&role);
-          parentAccessible = lastChildAcc;
-        } while (role != nsIAccessible::ROLE_LIST && lastChildAcc);
-    }
-    mParent = parentAccessible;
-  }
-}
-
-/** click us! */
-NS_IMETHODIMP nsSelectOptionAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("select"), _retval); 
-    return NS_OK;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/** We are a ListItem */
-NS_IMETHODIMP nsSelectOptionAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LISTITEM;
-  return NS_OK;
-}
-
-/** Return our cached parent */
-NS_IMETHODIMP nsSelectOptionAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-  *_retval = mParent;
-  NS_IF_ADDREF(*_retval);
-  return NS_OK;
-}
-
-/**
-  * Get our Name from our Content's subtree
-  */
-NS_IMETHODIMP nsSelectOptionAccessible::GetAccName(nsAString& _retval)
-{
-  // CASE #1 -- great majority of the cases
-  // find the label attribute - this is what the W3C says we should use
-  nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(domElement, "No domElement for accessible DOM node!");
-  nsresult rv = domElement->GetAttribute(NS_LITERAL_STRING("label"), _retval) ;
-
-  if (NS_SUCCEEDED(rv) && !_retval.IsEmpty() ) {
-    return NS_OK;
-  }
-  
-  // CASE #2 -- no label parameter, get the first child, 
-  // use it if it is a text node
-  nsCOMPtr<nsIDOMNode> child;
-  mDOMNode->GetFirstChild(getter_AddRefs(child));
-
-  if (child) {
-    nsCOMPtr<nsIDOMText> text (do_QueryInterface(child));
-    if (text) {
-      nsCOMPtr<nsIContent> content (do_QueryInterface(child));
-      if (!content) {
-        return NS_ERROR_FAILURE;
-      }
-      nsAutoString txtValue;
-      rv = AppendFlatStringFromContentNode(content, &txtValue);
-      if (NS_SUCCEEDED(rv)) {
-        // Temp var (txtValue) needed until CompressWhitespace built for nsAString
-        txtValue.CompressWhitespace();
-        _retval.Assign(txtValue);
-        return NS_OK;
-      }
-    }
-  }
-  
-  return NS_ERROR_FAILURE;
-}
-
-/** ------------------------------------------------------ */
-/**  Secondly, the Listbox widget                          */
-/** ------------------------------------------------------ */
-
-/** ----- nsListboxAccessible ----- */
-
-/** Constructor */
-nsListboxAccessible::nsListboxAccessible(nsIDOMNode* aDOMNode, 
-                                                   nsIWeakReference* aShell):
-nsAccessible(aDOMNode, aShell)
-{
-}
-
-/** We are a window, as far as MSAA is concerned */
-NS_IMETHODIMP nsListboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_WINDOW;
-  return NS_OK;
-}
-
-/**
-  * We always have 1 child: a subclass of nsSelectListAccessible.
-  */
-NS_IMETHODIMP nsListboxAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/**
-  * As a nsHTMLListboxAccessible we can have the following states:
-  *     STATE_FOCUSED
-  *     STATE_READONLY
-  *     STATE_FOCUSABLE
-  */
-NS_IMETHODIMP nsListboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus status from base class
-  nsAccessible::GetAccState(_retval);
-
-  *_retval |= STATE_READONLY | STATE_FOCUSABLE;
-
-  return NS_OK;
-}
-
-/** ------------------------------------------------------ */
-/**  Finally, the Combobox widgets                         */
-/** ------------------------------------------------------ */
-
-/** ----- nsComboboxAccessible ----- */
-
-/**
-  * Constructor -- set initial state - closed, register ourself
-  */
-nsComboboxAccessible::nsComboboxAccessible(nsIDOMNode* aDOMNode, 
-                                                   nsIWeakReference* aShell):
-nsAccessible(aDOMNode, aShell)
-{
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-  SetupMenuListener();
-}
-
-/**
-  * Destructor -- If we are registered, remove ourselves as a listener.
-  */
-nsComboboxAccessible::~nsComboboxAccessible()
-{
-  if (mRegistered) {
-    nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
-    if (eventReceiver) 
-      eventReceiver->RemoveEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE);   
-  }
-}
-
-/** 
-  * Inherit the ISupports impl from nsAccessible, 
-  *  handle nsIDOMXULListener and nsIAccessibleSelectable ourself 
-  */
-NS_IMPL_ISUPPORTS_INHERITED2(nsComboboxAccessible, nsAccessible, nsIDOMXULListener, nsIAccessibleSelectable)
-
-/**
-  * If we aren't already registered, register ourselves as a
-  *     listener to "popupshowing" events on our DOM node. Set our
-  *     state to registered, but don't notify MSAA as they 
-  *     don't need to know about this state.
-  */
-void
-nsComboboxAccessible::SetupMenuListener()
-{
-  // if not already registered as a popup listener, register ourself
-  if (!mRegistered) {
-    nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
-    if (eventReceiver && NS_SUCCEEDED(eventReceiver->AddEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE)))
-      mRegistered = PR_TRUE;
-  }
-}
-
-/** We are a combobox */
-NS_IMETHODIMP nsComboboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_COMBOBOX;
-  return NS_OK;
-}
-
-/**
-  * We always have 3 children: TextField, Button, Window. In that order
-  */
-NS_IMETHODIMP nsComboboxAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 3;
-  return NS_OK;
-}
-
-/**
-  * nsIAccessibleSelectable method. No-op because our selection is returned through
-  *     GetValue(). This _may_ change just to provide additional info for the vendors
-  *     and another option for them to get at stuff. Despite the fact that we are
-  *     single selection only.
-  */
-NS_IMETHODIMP nsComboboxAccessible::GetSelectedChildren(nsISupportsArray **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * As a nsComboboxAccessible we can have the following states:
-  *     STATE_FOCUSED
-  *     STATE_READONLY
-  *     STATE_FOCUSABLE
-  *     STATE_HASPOPUP
-  *     STATE_EXPANDED
-  *     STATE_COLLAPSED
-  */
-NS_IMETHODIMP nsComboboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus status from base class
-  nsAccessible::GetAccState(_retval);
-
-  if (mOpen)
-    *_retval |= STATE_EXPANDED;
-  else
-    *_retval |= STATE_COLLAPSED;
-
-  *_retval |= STATE_HASPOPUP | STATE_READONLY | STATE_FOCUSABLE;
-
-  return NS_OK;
-}
-
-/**
-  * Set our state to open and (TBD) fire an event to MSAA saying our state
-  *     has changed.
-  */
-NS_IMETHODIMP nsComboboxAccessible::PopupShowing(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-/**
-  * Set our state to not open and (TDB) fire an event to MSAA saying
-  *     our state has changed.
-  */
-NS_IMETHODIMP nsComboboxAccessible::PopupHiding(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-/**
-  * Set our state to not open and (TDB) fire an event to MSAA saying
-  *     our state has changed.
-  */
-NS_IMETHODIMP nsComboboxAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-/** ----- nsComboboxTextFieldAccessible ----- */
-
-/** Constructor */
-nsComboboxTextFieldAccessible::nsComboboxTextFieldAccessible(nsIAccessible* aParent, 
-                                                                 nsIDOMNode* aDOMNode, 
-                                                                 nsIWeakReference* aShell):
-nsLeafAccessible(aDOMNode, aShell)
-{
-  mParent = aParent;
-}
-
-/**
-  * Currently gets the text from the first option, needs to check for selection
-  *     and then return that text.
-  *     Walks the Frame tree and checks for proper frames.
-  */
-NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccValue(nsAString& _retval)
-{
-  nsIFrame* frame = nsAccessible::GetBoundsFrame();
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-  if (!frame || !context)
-    return NS_ERROR_FAILURE;
-
-  frame->FirstChild(context, nsnull, &frame);
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
-    return NS_ERROR_FAILURE;
-#endif
-
-  frame->FirstChild(context, nsnull, &frame);
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::textFrame))
-    return NS_ERROR_FAILURE;
-#endif
-
-  nsCOMPtr<nsIContent> content;
-  frame->GetContent(getter_AddRefs(content));
-
-  if (!content) 
-    return NS_ERROR_FAILURE;
-
-  AppendFlatStringFromSubtree(content, &_retval);
-
-  return NS_OK;
-}
-
-/**
-  * Gets the bounds for the BlockFrame.
-  *     Walks the Frame tree and checks for proper frames.
-  */
-void nsComboboxTextFieldAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame)
-{
-  // get our first child's frame
-  nsIFrame* frame = nsAccessible::GetBoundsFrame();
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-  if (!frame || !context)
-    return;
-
-  frame->FirstChild(context, nsnull, aBoundingFrame);
-  frame->FirstChild(context, nsnull, &frame);
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
-    return;
-#endif
-
-  frame->GetRect(aBounds);
-}
-
-/** Return our cached parent */
-NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
-
-/**
-  * We are the first child of our parent, no previous sibling
-  */
-NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = nsnull;
-  return NS_OK;
-} 
-
-/**
-  * Our role is currently only static text, but we should be able to have
-  *     editable text here and we need to check that case.
-  */
-NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_STATICTEXT;
-  return NS_OK;
-}
-
-/**
-  * As a nsComboboxTextFieldAccessible we can have the following states:
-  *     STATE_READONLY
-  *     STATE_FOCUSED
-  *     STATE_FOCUSABLE
-  */
-NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus status from base class
-  nsAccessible::GetAccState(_retval);
-
-  *_retval |= STATE_READONLY | STATE_FOCUSABLE;
-
-  return NS_OK;
-}
-
-/** -----ComboboxButtonAccessible ----- */
-
-/** Constructor -- cache our parent */
-nsComboboxButtonAccessible::nsComboboxButtonAccessible(nsIAccessible* aParent, 
-                                                           nsIDOMNode* aDOMNode, 
-                                                           nsIWeakReference* aShell):
-nsLeafAccessible(aDOMNode, aShell)
-{
-  mParent = aParent;
-}
-
-/** Just one action ( click ). */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eSingle_Action;
-  return NS_OK;
-}
-
-/**
-  * Gets the bounds for the gfxButtonControlFrame.
-  *     Walks the Frame tree and checks for proper frames.
-  */
-void nsComboboxButtonAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame)
-{
-  // get our second child's frame
-  nsIFrame* frame = nsAccessible::GetBoundsFrame();
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-  if (!context)
-    return;
-
-  *aBoundingFrame = frame;  // bounding frame is the ComboboxControlFrame
-  frame->FirstChild(context, nsnull, &frame); // first frame is for the textfield
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
-    return;
-#endif
-
-  frame->GetNextSibling(&frame);  // sibling frame is for the button
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::gfxButtonControlFrame))
-    return;
-#endif
-
-  frame->GetRect(aBounds);
-}
-
-/** We are a button. */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PUSHBUTTON;
-  return NS_OK;
-}
-
-/** Return our cached parent */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-  *_retval = mParent;
-  NS_IF_ADDREF(*_retval);
-  return NS_OK;
-}
-
-/** 
-  * Gets the name from GetAccActionName()
-  */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAString& _retval)
-{
-  return GetAccActionName(eAction_Click, _retval);
-}
-
-/**
-  * Our action name is the reverse of our state: 
-  *     if we are closed -> open is our name.
-  *     if we are open -> closed is our name.
-  * Uses the frame to get the state, updated on every click
-  */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  PRBool isOpen = PR_FALSE;
-  nsIFrame *boundsFrame = GetBoundsFrame();
-  nsIComboboxControlFrame* comboFrame;
-  boundsFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboFrame);
-  if (!comboFrame)
-    return NS_ERROR_FAILURE;
-  comboFrame->IsDroppedDown(&isOpen);
-  if (isOpen)
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("close"), _retval); 
-  else
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("open"), _retval); 
-
-  return NS_OK;
-}
-
-/**
-  * As a nsComboboxButtonAccessible we can have the following states:
-  *     STATE_PRESSED
-  *     STATE_FOCUSED
-  *     STATE_FOCUSABLE
-  */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus status from base class
-  nsAccessible::GetAccState(_retval);
-
-  // we are open or closed --> pressed or not
-  PRBool isOpen = PR_FALSE;
-  nsIFrame *boundsFrame = GetBoundsFrame();
-  nsIComboboxControlFrame* comboFrame;
-  boundsFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboFrame);
-  if (!comboFrame)
-    return NS_ERROR_FAILURE;
-  comboFrame->IsDroppedDown(&isOpen);
-  if (isOpen)
-  *_retval |= STATE_PRESSED;
-
-  *_retval |= STATE_FOCUSABLE;
-
-  return NS_OK;
-}
-
-/** ----- nsComboboxWindowAccessible ----- */
-
-/**
-  * Constructor -- cache our parent
-  */
-nsComboboxWindowAccessible::nsComboboxWindowAccessible(nsIAccessible* aParent, 
-                                                           nsIDOMNode* aDOMNode, 
-                                                           nsIWeakReference* aShell):
-nsAccessible(aDOMNode, aShell)
-{
-  mParent = aParent;
-}
-
-/**
-  * As a nsComboboxWindowAccessible we can have the following states:
-  *     STATE_FOCUSED
-  *     STATE_FOCUSABLE
-  *     STATE_INVISIBLE
-  *     STATE_FLOATING
-  */
-NS_IMETHODIMP nsComboboxWindowAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus status from base class
-  nsAccessible::GetAccState(_retval);
-
-  // we are open or closed
-  PRBool isOpen = PR_FALSE;
-  nsIFrame *boundsFrame = GetBoundsFrame();
-  nsIComboboxControlFrame* comboFrame = nsnull;
-  boundsFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboFrame);
-  if (!comboFrame)
-    return NS_ERROR_FAILURE;
-  comboFrame->IsDroppedDown(&isOpen);
-  if (! isOpen)
-    *_retval |= STATE_INVISIBLE;
-
-  *_retval |= STATE_FOCUSABLE | STATE_FLOATING;
-
-  return NS_OK;
-}
-
-/** We are a window */
-NS_IMETHODIMP nsComboboxWindowAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_WINDOW;
-  return NS_OK;
-}
-
-/** Return our cached parent */
-NS_IMETHODIMP nsComboboxWindowAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
-
-/**
-  * We are the last sibling of our parent.
-  */
-NS_IMETHODIMP nsComboboxWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * We only have one child, a list
-  */
-NS_IMETHODIMP nsComboboxWindowAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/**
-  * Gets the bounds for the areaFrame.
-  *     Walks the Frame tree and checks for proper frames.
-  */
-void nsComboboxWindowAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame)
-{
-   // get our first option
-  nsCOMPtr<nsIDOMNode> child;
-  mDOMNode->GetFirstChild(getter_AddRefs(child));
-
-  // now get its frame
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  if (!shell) {
-    *aBoundingFrame = nsnull;
-    return;
-  }
-
-  nsIFrame* frame = nsnull;
-  nsCOMPtr<nsIContent> content(do_QueryInterface(child));
-  shell->GetPrimaryFrameFor(content, &frame);
-  if (!frame) {
-    *aBoundingFrame = nsnull;
-    return;
-  }
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
-    return;
-#endif
-
-  frame->GetParent(aBoundingFrame);
-  frame->GetParent(&frame);
-#ifdef DEBUG
-  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::areaFrame))
-    return;
-#endif
-
-  frame->GetRect(aBounds);
-}
-

mozilla/accessible/src/base/nsSelectAccessible.h

@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s):  John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef __nsSelectAccessible_h__
-#define __nsSelectAccessible_h__
-
-#include "nsBaseWidgetAccessible.h"
-#include "nsIAccessibleSelectable.h"
-#include "nsIDOMXULListener.h"
-
-/** ------------------------------------------------------ */
-/**  First, the common widgets                             */
-/** ------------------------------------------------------ */
-
-/**
-  * The list that contains all the options in the select.
-  */
-class nsSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectListAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsSelectListAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/**
-  * Options inside the select, contained within the list
-  */
-class nsSelectOptionAccessible : public nsLeafAccessible
-{
-public:
-  
-  nsSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsSelectOptionAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD GetAccName(nsAString& _retval);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/** ------------------------------------------------------ */
-/**  Secondly, the Listbox widget                          */
-/** ------------------------------------------------------ */
-
-/**
-  * A class that represents the Listbox widget.
-  */
-class nsListboxAccessible : public nsAccessible
-{
-public:
-  
-  nsListboxAccessible (nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsListboxAccessible () {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-};
-
-/** ------------------------------------------------------ */
-/**  Finally, the Combobox widgets                         */
-/** ------------------------------------------------------ */
-
-/**
-  * A class the represents the HTML Combobox widget.
-  */
-class nsComboboxAccessible : public nsAccessible,
-                             public nsIAccessibleSelectable,
-                             public nsIDOMXULListener
-{
-public:
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLESELECTABLE
-  
-  nsComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsComboboxAccessible();
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  /* ----- nsIDOMXULListener ----- */
-  NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent);
-  NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent);
-  NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }
-  
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  virtual void SetupMenuListener();
-
-protected:
-
-  PRBool mRegistered;
-  PRBool mOpen;
-
-};
-
-/**
-  * A class the represents the text field in the Combobox to the left
-  *     of the drop down button
-  */
-class nsComboboxTextFieldAccessible  : public nsLeafAccessible
-{
-public:
-  
-  nsComboboxTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsComboboxTextFieldAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/**
-  * A class that represents the button inside the Select to the
-  *     right of the text field
-  */
-class nsComboboxButtonAccessible  : public nsLeafAccessible
-{
-public:
-
-  nsComboboxButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsComboboxButtonAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(nsAString& _retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/**
-  * A class that represents the window that lives to the right
-  * of the drop down button inside the Select. This is the window
-  * that is made visible when the button is pressed.
-  */
-class nsComboboxWindowAccessible : public nsAccessible
-{
-public:
-
-  nsComboboxWindowAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsComboboxWindowAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
-   
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent; 
-};
-
-#endif

mozilla/accessible/src/html/Makefile.in

@@ -1,71 +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_html_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  locale \
-  necko \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  webbrwsr \
-  $(NULL)
-
-CPPSRCS = \
-  nsHTMLAreaAccessible.cpp \
-  nsHTMLFormControlAccessible.cpp \
-  nsHTMLIFrameRootAccessible.cpp \
-  nsHTMLImageAccessible.cpp \
-  nsHTMLLinkAccessible.cpp \
-  nsHTMLSelectAccessible.cpp \
-  nsHTMLTableAccessible.cpp \
-  nsHTMLTextAccessible.cpp \
-  $(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../base \
-  $(NULL)

mozilla/accessible/src/html/makefile.win

@@ -1,74 +0,0 @@
-#!gmake
-#
-# 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 = ..\..\..
-MODULE = accessibility
-LIBRARY_NAME = accessibility_html_s
-REQUIRES = \
-  content \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  layout \
-  locale \
-  necko \
-  string \
-  uriloader \
-  webshell \
-  widget \
-  xpcom \
-  $(NULL)
-
-CPP_OBJS = \
-  .\$(OBJDIR)\nsHTMLAreaAccessible.obj \
-  .\$(OBJDIR)\nsHTMLFormControlAccessible.obj \
-  .\$(OBJDIR)\nsHTMLIFrameRootAccessible.obj \
-  .\$(OBJDIR)\nsHTMLImageAccessible.obj \
-  .\$(OBJDIR)\nsHTMLLinkAccessible.obj \
-  .\$(OBJDIR)\nsHTMLSelectAccessible.obj \
-  .\$(OBJDIR)\nsHTMLTableAccessible.obj \
-  .\$(OBJDIR)\nsHTMLTextAccessible.obj \
-  $(NULL)
-
-EXPORTS = \
-  $(NULL)
-
-LINCS = \
-  -I..\base \
-  -I..\..\..\layout\html\forms\public \
-  -I..\..\..\layout\html\forms\src \
-  -I..\..\..\layout\html\base\src \
-  $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-
-
-

mozilla/accessible/src/html/nsHTMLAreaAccessible.cpp

@@ -1,41 +1,25 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsGenericAccessible.h"
 #include "nsHTMLAreaAccessible.h"
@@ -46,6 +30,7 @@
 #include "nsIServiceManager.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMHTMLAreaElement.h"
+#include "nsGUIEvent.h"
 
 
 // --- area -----
@@ -56,7 +41,7 @@ nsLinkableAccessible(aDomNode, aShell), mAccParent(aAccParent)
 }
 
 /* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAString & _retval)
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAWritableString & _retval)
 {
   nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
   if (elt) {
@@ -74,7 +59,7 @@ NS_IMETHODIMP nsHTMLAreaAccessible::GetAccRole(PRUint32 *_retval)
 }
 
 /* wstring getAccValue (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
   if (elt) 
@@ -83,7 +68,7 @@ NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAString& _retval)
 }
 
 /* wstring getAccDescription (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAString& _retval)
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAWritableString& _retval)
 {
   // Still to do - follow IE's standard here
   nsCOMPtr<nsIDOMHTMLAreaElement> area(do_QueryInterface(mDOMNode));

mozilla/accessible/src/html/nsHTMLAreaAccessible.h

@@ -1,46 +1,30 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsHTMLAreaAccessible_H_
 #define _nsHTMLAreaAccessible_H_
 
-#include "nsBaseWidgetAccessible.h"
+#include "nsGenericAccessible.h"
 #include "nsAccessible.h"
 
 /* Accessible for image map areas - must be child of image
@@ -51,16 +35,16 @@ class nsHTMLAreaAccessible : public nsLinkableAccessible
 
 public:
   nsHTMLAreaAccessible(nsIDOMNode *domNode, nsIAccessible *accParent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString & _retval); 
+  NS_IMETHOD GetAccName(nsAWritableString & _retval); 
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
   NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
   NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
   NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
   NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
   NS_IMETHOD GetAccNextSibling(nsIAccessible * *aAccNextSibling);
   NS_IMETHOD GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling);
-  NS_IMETHOD GetAccDescription(nsAString& _retval);
+  NS_IMETHOD GetAccDescription(nsAWritableString& _retval);
   NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
 
 protected:

mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -1,157 +1,241 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Eric Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
-// NOTE: alphabetically ordered
-#include "nsAccessible.h"
-#include "nsFormControlAccessible.h"
-#include "nsHTMLAtoms.h"
 #include "nsHTMLFormControlAccessible.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsIDOMHTMLFormElement.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMNSHTMLButtonElement.h"
-#include "nsIDOMHTMLLabelElement.h"
-#include "nsIDOMHTMLTextAreaElement.h"
-#include "nsIDOMXULCheckboxElement.h"
-#include "nsIDOMXULButtonElement.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsINameSpaceManager.h"
-#include "nsIFrame.h"
-#include "nsISelectionController.h"
-#include "nsReadableUtils.h"
 #include "nsWeakReference.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMHTMLTextAreaElement.h"
+#include "nsINameSpaceManager.h"
+#include "nsHTMLAtoms.h"
+#include "nsIDOMHTMLButtonElement.h"
+#include "nsReadableUtils.h"
+#include "nsString.h"
+#include "nsAccessible.h"
+#include "nsIFrame.h"
+#include "nsIDOMHTMLLabelElement.h"
+#include "nsIDOMHTMLFormElement.h"
+#include "nsISelectionController.h"
+
+nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsLeafAccessible(aNode, aShell)
+{ 
+}
+
+NS_IMETHODIMP nsHTMLFormControlAccessible::AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel)
+{
+  PRInt32 numChildren = 0;
+
+  nsCOMPtr<nsIDOMHTMLLabelElement> labelElement(do_QueryInterface(aLookNode));
+  if (labelElement) {
+    nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(aLookNode));
+    nsresult rv = NS_OK;
+
+    if (elt) {
+      nsAutoString labelIsFor;
+      elt->GetAttribute(NS_LITERAL_STRING("for"),labelIsFor);
+      if (labelIsFor.Equals(*aId))
+        rv = AppendFlatStringFromSubtree(aLookNode, aLabel);
+    }
+    return rv;
+  }
+
+  aLookNode->ChildCount(numChildren);
+  nsIContent *contentWalker;
+  PRInt32 index;
+  for (index = 0; index < numChildren; index++) {
+    aLookNode->ChildAt(index, contentWalker);
+    if (contentWalker)
+      AppendLabelFor(contentWalker, aId, aLabel);
+  }
+  return NS_OK;
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIContent> walkUpContent(do_QueryInterface(mDOMNode));
+  nsCOMPtr<nsIDOMHTMLLabelElement> labelElement;
+  nsCOMPtr<nsIDOMHTMLFormElement> formElement;
+  nsresult rv = NS_OK;
+
+  nsAutoString label;
+  // go up tree get name of ancestor label if there is one. Don't go up farther than form element
+  while (walkUpContent && label.IsEmpty() && !formElement) {
+    labelElement = do_QueryInterface(walkUpContent);
+    if (labelElement) 
+      rv = AppendFlatStringFromSubtree(walkUpContent, &label);
+    formElement = do_QueryInterface(walkUpContent); // reached top ancestor in form
+    nsCOMPtr<nsIContent> nextParent;
+    walkUpContent->GetParent(*getter_AddRefs(nextParent));
+    walkUpContent = nextParent;
+  }
+  
+
+  // There can be a label targeted at this control using the for="control_id" attribute
+  // To save computing time, only look for those inside of a form element
+  walkUpContent = do_QueryInterface(formElement);
+  
+  if (walkUpContent) {
+    nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
+    nsAutoString forId;
+    elt->GetAttribute(NS_LITERAL_STRING("id"), forId);
+    // Actually we'll be walking down the content this time, with a depth first search
+    if (!forId.IsEmpty())
+      AppendLabelFor(walkUpContent,&forId,&label); 
+  } 
+  
+  label.CompressWhitespace();
+  if (label.IsEmpty())
+    return nsAccessible::GetAccName(_retval);
+
+  _retval.Assign(label);
+  
+  return NS_OK;
+}
+
+/* long getAccState (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
+{
+  // can be
+  // focusable, focused, checked, protected, unavailable
+  nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+
+  nsAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
+
+  PRBool checked = PR_FALSE;
+  element->GetChecked(&checked);
+  if (checked) *_retval |= STATE_CHECKED;
+
+  PRBool disabled = PR_FALSE;
+  element->GetDisabled(&disabled);
+  if (disabled)
+    *_retval |= STATE_UNAVAILABLE;
+
+  nsAutoString typeString;
+  element->GetType(typeString);
+  if (typeString.EqualsIgnoreCase("password"))
+    *_retval |= STATE_PROTECTED;
+
+  return NS_OK;
+}
 
 // --- checkbox -----
 
 nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
+nsHTMLFormControlAccessible(aNode, aShell)
 { 
 }
 
+/* unsigned long getAccRole (); */
 NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUint32 *_retval)
 {
   *_retval = ROLE_CHECKBUTTON;
   return NS_OK;
 }
 
+/* PRUint8 getAccNumActions (); */
 NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccNumActions(PRUint8 *_retval)
 {
-  *_retval = eSingle_Action;
+  *_retval = 1;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
-  if (index == eAction_Click) {    // 0 is the magic value for default action
+  if (index == 0) {
     // check or uncheck
-    PRUint32 state;
-    GetAccState(&state);
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
 
-    if (state & STATE_CHECKED)
-      nsAccessible::GetTranslatedString(NS_LITERAL_STRING("uncheck"), _retval); 
+    PRBool checked = PR_FALSE;
+    if (element) 
+      element->GetChecked(&checked);
+
+    if (checked)
+      _retval = NS_LITERAL_STRING("uncheck");
     else
-      nsAccessible::GetTranslatedString(NS_LITERAL_STRING("check"), _retval); 
+      _retval = NS_LITERAL_STRING("check");
 
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
+/* void accDoAction (in PRUint8 index); */
 NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoAction(PRUint8 index)
 {
   if (index == 0) {   // 0 is the magic value for default action
-    nsCOMPtr<nsIDOMHTMLInputElement> htmlCheckboxElement(do_QueryInterface(mDOMNode));
-    if (htmlCheckboxElement) {
-      htmlCheckboxElement->Click();
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    PRBool checked = PR_FALSE;
+    element->GetChecked(&checked);
+    element->SetChecked(checked ? PR_FALSE : PR_TRUE);
+    return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsFormControlAccessible::GetAccState(_retval);
-  PRBool checked = PR_FALSE;   // Radio buttons and check boxes can be checked
-
-  nsCOMPtr<nsIDOMHTMLInputElement> htmlCheckboxElement(do_QueryInterface(mDOMNode));
-  if (htmlCheckboxElement) 
-    htmlCheckboxElement->GetChecked(&checked);
-
-  if (checked) 
-    *_retval |= STATE_CHECKED;
-  
-  return NS_OK;
-}
 
 //------ Radio button -------
 
 nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsRadioButtonAccessible(aNode, aShell)
+nsHTMLFormControlAccessible(aNode, aShell)
 { 
 }
 
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index)
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval)
 {
-  if (index == eAction_Click) {
-    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
-    if (element) {
-      element->Click();
-      return NS_OK;
-    }
+  *_retval = 1;
+  return NS_OK;
+}
+
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == 0) {
+    _retval = NS_LITERAL_STRING("select");
+    return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccState(PRUint32 *_retval)
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index)
 {
-  nsFormControlAccessible::GetAccState(_retval);
-  PRBool checked = PR_FALSE;   // Radio buttons and check boxes can be checked
+  if (index == 0) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    element->Click();
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
 
-  nsCOMPtr<nsIDOMHTMLInputElement> htmlRadioElement(do_QueryInterface(mDOMNode));
-  if (htmlRadioElement) 
-    htmlRadioElement->GetChecked(&checked);
 
-  if (checked) 
-    *_retval |= STATE_CHECKED;
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_RADIOBUTTON;
 
   return NS_OK;
 }
@@ -159,58 +243,47 @@ NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccState(PRUint32 *_retval)
 // ----- Button -----
 
 nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
+nsHTMLFormControlAccessible(aNode, aShell)
 { 
 }
 
+/* PRUint8 getAccNumActions (); */
 NS_IMETHODIMP nsHTMLButtonAccessible::GetAccNumActions(PRUint8 *_retval)
 {
-  *_retval = eSingle_Action;
-  return NS_OK;
+  *_retval = 1;
+  return NS_OK;;
 }
 
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
-  if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); 
+  if (index == 0) {
+    _retval = NS_LITERAL_STRING("press");
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
+/* void accDoAction (in PRUint8 index); */
 NS_IMETHODIMP nsHTMLButtonAccessible::AccDoAction(PRUint8 index)
 {
-  if (index == eAction_Click) {
+  if (index == 0) {
     nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
-    if (element) {
-      element->Click();
-      return NS_OK;
-    }
+    element->Click();
+    return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsFormControlAccessible::GetAccState(_retval);
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No nsIDOMElement for button node!");
-
-  nsAutoString buttonType;
-  element->GetAttribute(NS_LITERAL_STRING("type"), buttonType);
-  if (buttonType.EqualsIgnoreCase("submit"))
-    *_retval |= STATE_DEFAULT;
-
-  return NS_OK;
-}
-
+/* unsigned long getAccRole (); */
 NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUint32 *_retval)
 {
   *_retval = ROLE_PUSHBUTTON;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAString& _retval)
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMHTMLInputElement> button(do_QueryInterface(mDOMNode));
 
@@ -229,62 +302,56 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAString& _retval)
 // ----- HTML 4 Button: can contain arbitrary HTML content -----
 
 nsHTML4ButtonAccessible::nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsLeafAccessible(aNode, aShell)
+nsHTMLBlockAccessible(aNode, aShell)
 { 
 }
 
+/* PRUint8 getAccNumActions (); */
 NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccNumActions(PRUint8 *_retval)
 {
-  *_retval = eSingle_Action;
+  *_retval = 1;
   return NS_OK;;
 }
 
-NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
-  if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); 
+  if (index == 0) {
+    _retval = NS_LITERAL_STRING("press");
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
+/* void accDoAction (in PRUint8 index); */
 NS_IMETHODIMP nsHTML4ButtonAccessible::AccDoAction(PRUint8 index)
 {
   if (index == 0) {
-    nsCOMPtr<nsIDOMNSHTMLButtonElement> buttonElement(do_QueryInterface(mDOMNode));
-    if ( buttonElement )
-    {
-      buttonElement->Click();
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    element->Click();
+    return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
 
+/* unsigned long getAccRole (); */
 NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccRole(PRUint32 *_retval)
 {
   *_retval = ROLE_PUSHBUTTON;
   return NS_OK;
 }
 
+/* long getAccState (); */
 NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccState(PRUint32 *_retval)
 {
   nsAccessible::GetAccState(_retval);
   *_retval |= STATE_FOCUSABLE;
-
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No nsIDOMElement for button node!");
-
-  nsAutoString buttonType;
-  element->GetAttribute(NS_LITERAL_STRING("type"), buttonType);
-  if (buttonType.EqualsIgnoreCase("submit"))
-    *_retval |= STATE_DEFAULT;
-
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAString& _retval)
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsresult rv = NS_ERROR_FAILURE;
   nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
@@ -294,7 +361,7 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAString& _retval)
     rv = AppendFlatStringFromSubtree(content, &name);
 
   if (NS_SUCCEEDED(rv)) {
-    // Temp var needed until CompressWhitespace built for nsAString
+    // Temp var needed until CompressWhitespace built for nsAWritableString
     name.CompressWhitespace();
     _retval.Assign(name);
   }
@@ -306,23 +373,20 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAString& _retval)
 // --- textfield -----
 
 nsHTMLTextFieldAccessible::nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
+nsHTMLFormControlAccessible(aNode, aShell)
 { 
 }
 
+/* unsigned long getAccRole (); */
 NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccRole(PRUint32 *_retval)
 {
   *_retval = ROLE_TEXT;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAString& _retval)
+/* wstring getAccValue (); */
+NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAWritableString& _retval)
 {
-  PRUint32 state;
-  GetAccState(&state);
-  if (state & STATE_PROTECTED)    // Don't return password text!
-    return NS_ERROR_FAILURE;
-
   nsCOMPtr<nsIDOMHTMLTextAreaElement> textArea(do_QueryInterface(mDOMNode));
   if (textArea) {
     textArea->GetValue(_retval);
@@ -338,6 +402,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAString& _retval)
   return NS_ERROR_FAILURE;
 }
 
+/* long getAccState (); */
 NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval)
 {
   // can be
@@ -364,8 +429,8 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval)
   nsCOMPtr<nsIPresContext> context;
   shell->GetPresContext(getter_AddRefs(context));
   nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-  nsIFrame *frame = nsnull;
-  if (content && NS_SUCCEEDED(shell->GetPrimaryFrameFor(content, &frame)) && frame) {
+  nsIFrame *frame;
+  if (content && NS_SUCCEEDED(shell->GetPrimaryFrameFor(content, &frame))) {
     nsCOMPtr<nsISelectionController> selCon;
     frame->GetSelectionController(context,getter_AddRefs(selCon));
     if (selCon) {
@@ -385,7 +450,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval)
     if (inputElement) {
       /////// ====== Must be a password field, so it uses nsIDOMHTMLFormControl ==== ///////
       PRUint32 moreStates = 0;
-      nsresult rv = nsFormControlAccessible::GetAccState(&moreStates);
+      nsresult rv = nsHTMLFormControlAccessible::GetAccState(&moreStates);
       *_retval |= moreStates;
       return rv;
     }
@@ -400,47 +465,3 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval)
   return NS_OK;
 }
 
-
-// --- groupbox  -----
-
-/*
- * The HTML for this is <fieldset> <legend>box-title</legend> form elements </fieldset> 
- */
-
-nsHTMLGroupboxAccessible::nsHTMLGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_GROUPING;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Groupbox doesn't support any states!
-  *_retval = 0;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccName(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  if (element) {
-    nsCOMPtr<nsIDOMNodeList> legends;
-    element->GetElementsByTagName(NS_LITERAL_STRING("legend"), getter_AddRefs(legends));
-    if (legends) {
-      nsCOMPtr<nsIDOMNode> legendNode;
-      legends->Item(0, getter_AddRefs(legendNode));
-      nsCOMPtr<nsIContent> legendContent(do_QueryInterface(legendNode));
-      if (legendContent) {
-        _retval.Assign(NS_LITERAL_STRING(""));  // Default name is blank 
-        return AppendFlatStringFromSubtree(legendContent, &_retval);
-      }
-    }
-  }
-  return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLFormControlAccessible.h

@@ -1,113 +1,105 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Eric D Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsHTMLFormControlAccessible_H_
 #define _nsHTMLFormControlAccessible_H_
 
-#include "nsBaseWidgetAccessible.h"
-#include "nsFormControlAccessible.h"
+#include "nsAccessible.h"
 
 class nsICheckboxControlFrame;
 
-class nsHTMLCheckboxAccessible : public nsFormControlAccessible
+/* Accessible for supporting for controls
+ * supports:
+ * - walking up to get name from label
+ * - support basic state
+ */
+class nsHTMLFormControlAccessible : public nsLeafAccessible
+{
+
+public:
+  nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+
+protected:
+  NS_IMETHODIMP AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel);
+};
+
+class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
 {
 
 public:
   nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
   NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
   NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
 };
 
-class nsHTMLRadioButtonAccessible : public nsRadioButtonAccessible
+class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
 {
 
 public:
   nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
   NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
 };
 
-class nsHTMLButtonAccessible : public nsFormControlAccessible
+class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
 {
 
 public:
   nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
   NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
   NS_IMETHOD AccDoAction(PRUint8 index);
 };
 
-class nsHTML4ButtonAccessible : public nsLeafAccessible
+class nsHTML4ButtonAccessible : public nsHTMLBlockAccessible
 {
 
 public:
   nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
   NS_IMETHOD GetAccState(PRUint32 *_retval);
   NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
   NS_IMETHOD AccDoAction(PRUint8 index);
 };
 
-class nsHTMLTextFieldAccessible : public nsFormControlAccessible
+
+class nsHTMLTextFieldAccessible : public nsHTMLFormControlAccessible
 {
 public:
   nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAString& _retval); 
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval); 
   NS_IMETHOD GetAccState(PRUint32 *_retval);
 };
 
-class nsHTMLGroupboxAccessible : public nsAccessible
-{
-public:
-  nsHTMLGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAString& _retval);
-};
-
 #endif  

mozilla/accessible/src/html/nsHTMLIFrameRootAccessible.cpp

@@ -1,58 +1,54 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsHTMLIFrameRootAccessible.h"
 #include "nsCOMPtr.h"
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
+#include "nsIPresContext.h"
 #include "nsIContent.h"
 #include "nsIFrame.h"
+#include "nsIDocShell.h"
+#include "nsIWebShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIXULDocument.h"
 #include "nsIDOMDocument.h"
+#include "nsIDOMDocumentType.h"
+#include "nsINameSpaceManager.h"
 #include "nsReadableUtils.h"
 
 NS_INTERFACE_MAP_BEGIN(nsHTMLIFrameRootAccessible)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMFormListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener)
 NS_INTERFACE_MAP_END_INHERITING(nsRootAccessible)
 
 NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
 NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameAccessible, nsBlockAccessible);
-NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameAccessible, nsBlockAccessible);
+NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
+NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
+
 
 NS_IMETHODIMP
 nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
@@ -65,21 +61,22 @@ nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
     NS_IF_ADDREF(this);
     return NS_OK;
   }
-  return nsBlockAccessible::QueryInterface(aIID, aInstancePtr); 
+  return nsHTMLBlockAccessible::QueryInterface(aIID, aInstancePtr); 
 }
 
+
 nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *aDoc):
-  nsBlockAccessible(aNode, aShell), mRootAccessible(aRoot), nsDocAccessibleMixin(aDoc)
+  nsHTMLBlockAccessible(aNode, aShell), mRootAccessible(aRoot), nsDocAccessibleMixin(aDoc)
 {
 }
 
   /* attribute wstring accName; */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAString& aAccName) 
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAWritableString& aAccName) 
 { 
   return GetTitle(aAccName);
 }
 
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAString& aAccValue) 
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAWritableString& aAccValue) 
 { 
   return GetURL(aAccValue);
 }
@@ -111,30 +108,30 @@ NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccRole(PRUint32 *_retval)
 
 NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccState(PRUint32 *aAccState)
 {
-  return nsAccessible::GetAccState(aAccState);
+  return nsDocAccessibleMixin::GetAccState(aAccState);
 }
 
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAString& aURL)
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAWritableString& aURL)
 {
   return nsDocAccessibleMixin::GetURL(aURL);
 }
 
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAString& aTitle)
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAWritableString& aTitle)
 {
   return nsDocAccessibleMixin::GetTitle(aTitle);
 }
 
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAString& aMimeType)
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAWritableString& aMimeType)
 {
   return nsDocAccessibleMixin::GetMimeType(aMimeType);
 }
 
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAString& aDocType)
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAWritableString& aDocType)
 {
   return nsDocAccessibleMixin::GetDocType(aDocType);
 }
 
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAString& aNameSpaceURI)
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
 {
   return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI);
 }
@@ -153,8 +150,9 @@ NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocument(nsIDocument **doc)
 // construction 
 //-----------------------------------------------------
 nsHTMLIFrameRootAccessible::nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-  mOuterNode(aNode), nsRootAccessible(aShell)
+  nsRootAccessible(aShell)
 {
+  mRealDOMNode = aNode;
 }
 
 //-----------------------------------------------------
@@ -164,42 +162,113 @@ nsHTMLIFrameRootAccessible::~nsHTMLIFrameRootAccessible()
 {
 }
 
-void nsHTMLIFrameRootAccessible::Init()
-{
-  if (!mOuterAccessible) {
-    nsCOMPtr<nsIDOMDocument> domDoc;
-    mOuterNode->GetOwnerDocument(getter_AddRefs(domDoc));
-    nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
-    if (doc) {
-      nsCOMPtr<nsIPresShell> parentShell;
-      doc->GetShellAt(0, getter_AddRefs(parentShell));
-      if (parentShell) {
-        nsCOMPtr<nsIContent> content(do_QueryInterface(mOuterNode));
-        nsIFrame* frame = nsnull;
-        parentShell->GetPrimaryFrameFor(content, &frame);
-        NS_ASSERTION(frame, "No outer frame.");
-        frame->GetAccessible(getter_AddRefs(mOuterAccessible));
-        NS_ASSERTION(mOuterAccessible, "Something's wrong - there's no accessible for the outer parent of this frame.");
-      }
-    }
-  }
-}
   /* readonly attribute nsIAccessible accParent; */
 NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccParent(nsIAccessible * *_retval) 
 { 
-  Init();
-  return mOuterAccessible->GetAccParent(_retval);
+  nsCOMPtr<nsIAccessible> accessible;
+  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
+    return accessible->GetAccParent(_retval);
+
+  *_retval = nsnull;
+  return NS_OK;
 }
 
   /* nsIAccessible getAccNextSibling (); */
 NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccNextSibling(nsIAccessible **_retval) 
 {
-  Init();
-  return mOuterAccessible->GetAccNextSibling(_retval);
+  nsCOMPtr<nsIAccessible> accessible;
+
+  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
+    return accessible->GetAccNextSibling(_retval);
+
+  *_retval = nsnull;
+  return NS_ERROR_FAILURE;
 }
 
+  /* nsIAccessible getAccPreviousSibling (); */
 NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccPreviousSibling(nsIAccessible **_retval) 
 {
-  Init();
-  return mOuterAccessible->GetAccPreviousSibling(_retval);
+  nsCOMPtr<nsIAccessible> accessible;
+
+  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
+    return accessible->GetAccPreviousSibling(_retval);
+
+  *_retval = nsnull;
+  return NS_ERROR_FAILURE;
 }
+
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetHTMLIFrameAccessible(nsIAccessible** aAcc)
+{
+  // Start by finding our PresShell and from that
+  // we get our nsIDocShell in order to walk the DocShell tree
+  nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mPresShell));
+  if (!presShell) {
+     *aAcc = nsnull;
+     return NS_ERROR_FAILURE;  
+  }
+
+  nsCOMPtr<nsIDocShell> docShell;
+  if (NS_SUCCEEDED(GetDocShellFromPS(presShell, getter_AddRefs(docShell)))) {
+    // Now that we have the DocShell QI 
+    // it to a tree item to find it's parent
+    nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(docShell));
+    if (item) {
+      nsCOMPtr<nsIDocShellTreeItem> itemParent;
+      item->GetParent(getter_AddRefs(itemParent));
+      // QI to get the WebShell for the parent document
+      nsCOMPtr<nsIDocShell> parentDocShell(do_QueryInterface(itemParent));
+      if (parentDocShell) {
+        // Get the PresShell/Content and 
+        // Root Content Node of the parent document
+        nsCOMPtr<nsIPresShell> parentPresShell;
+        nsCOMPtr<nsIPresContext> parentPresContext;
+        nsCOMPtr<nsIContent> rootContent;
+        if (NS_SUCCEEDED(GetDocShellObjects(parentDocShell,
+                                            getter_AddRefs(parentPresShell), 
+                                            getter_AddRefs(parentPresContext),
+                                            getter_AddRefs(rootContent)))) {
+          // QI the DocShell (of this sub-doc) to a webshell
+          nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(docShell));
+          if (webShell && parentPresShell && parentPresContext && rootContent) {
+            // Now, find the Content in the parent document
+            // that represents this sub-doc, 
+            // we do that matching webshells
+            nsCOMPtr<nsIContent> content;
+            if (FindContentForWebShell(parentPresShell, 
+                                       rootContent, 
+                                       webShell,
+                                       getter_AddRefs(content))) {
+              // OK, we found the content node in the parent doc
+              // that corresponds to this sub-doc
+              // Get the frame for that content
+              nsCOMPtr<nsIWeakReference> wr = do_GetWeakReference(parentPresShell);
+              nsIFrame* frame = nsnull;
+              parentPresShell->GetPrimaryFrameFor(content, &frame);
+#ifdef NS_DEBUG_X
+              printf("** Found: Con:%p  Fr:%p", content, frame);
+              char * name;
+              if (GetNameForFrame(frame, &name)) {
+                printf(" Name:[%s]", name);
+                nsMemory::Free(name);
+              }
+              printf("\n");
+#endif
+
+
+              nsCOMPtr<nsIDOMNode> node(do_QueryInterface(content));
+              nsCOMPtr<nsIAccessible> acc(do_QueryInterface(frame));
+
+              *aAcc = acc;
+              NS_IF_ADDREF(*aAcc);
+
+              return NS_OK;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+

mozilla/accessible/src/html/nsHTMLIFrameRootAccessible.h

@@ -1,45 +1,28 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsIFrameRootAccessible_H_
 #define _nsIFrameRootAccessible_H_
 
-#include "nsBaseWidgetAccessible.h"
 #include "nsRootAccessible.h"
 #include "nsAccessible.h"
 #include "nsIAccessibleDocument.h"
@@ -47,7 +30,7 @@
 class nsIWebShell;
 class nsIWeakReference;
 
-class nsHTMLIFrameAccessible : public nsBlockAccessible, 
+class nsHTMLIFrameAccessible : public nsHTMLBlockAccessible, 
                                public nsIAccessibleDocument,
                                public nsDocAccessibleMixin
 {
@@ -60,8 +43,8 @@ class nsHTMLIFrameAccessible : public nsBlockAccessible,
     NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
     NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
     NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-    NS_IMETHOD GetAccName(nsAString& aAccName);
-    NS_IMETHOD GetAccValue(nsAString& AccValue);
+    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
+    NS_IMETHOD GetAccValue(nsAWritableString& AccValue);
     NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
     NS_IMETHOD GetAccState(PRUint32 *aAccState);
 
@@ -87,14 +70,8 @@ class nsHTMLIFrameRootAccessible : public nsRootAccessible
     NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
 
   protected:
-    void Init();
-
-    // In these variable names, "outer" relates to the nsHTMLIFrameAccessible, as opposed to the 
-    // nsHTMLIFrameRootAccessible which is "inner".
-    // The outer node is a <browser> or <iframe> tag, whereas the inner node corresponds to the inner document root.
-
-    nsCOMPtr<nsIDOMNode> mOuterNode;
-    nsCOMPtr<nsIAccessible> mOuterAccessible;
+    NS_IMETHOD GetHTMLIFrameAccessible(nsIAccessible** aAcc);
+    nsCOMPtr<nsIDOMNode> mRealDOMNode;
 };
 
 

mozilla/accessible/src/html/nsHTMLImageAccessible.cpp

@@ -1,41 +1,25 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsGenericAccessible.h"
 #include "nsHTMLImageAccessible.h"
@@ -52,14 +36,13 @@
 
 // --- image -----
 
-nsHTMLImageAccessible::nsHTMLImageAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsHTMLImageAccessible::nsHTMLImageAccessible(nsIDOMNode* aDOMNode, nsIImageFrame *aImageFrame, nsIWeakReference* aShell):
 nsLinkableAccessible(aDOMNode, aShell)
 { 
   nsCOMPtr<nsIDOMElement> element(do_QueryInterface(aDOMNode));
   nsCOMPtr<nsIDocument> doc;
   nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  if (!shell)
-    return;
+  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
 
   shell->GetDocument(getter_AddRefs(doc));
   nsAutoString mapElementName;
@@ -110,7 +93,7 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval)
 
 
 /* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsresult rv = NS_ERROR_FAILURE;
 
@@ -119,7 +102,7 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAString& _retval)
     nsAutoString name;
     rv = AppendFlatStringFromContentNode(imageContent, &name);
     if (NS_SUCCEEDED(rv)) {
-      // Temp var needed until CompressWhitespace built for nsAString
+      // Temp var needed until CompressWhitespace built for nsAWritableString
       name.CompressWhitespace();
       _retval.Assign(name);
     }

mozilla/accessible/src/html/nsHTMLImageAccessible.h

@@ -1,47 +1,30 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsHTMLImageAccessible_H_
 #define _nsHTMLImageAccessible_H_
 
 #include "nsAccessible.h"
-#include "nsBaseWidgetAccessible.h"
 #include "nsIFrame.h"
 #include "nsIImageFrame.h"
 #include "nsIDOMHTMLMapElement.h"
@@ -55,8 +38,8 @@ class nsHTMLImageAccessible : public nsLinkableAccessible
 {
 
 public:
-  nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIImageFrame *imageFrame, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
   NS_IMETHOD GetAccState(PRUint32 *_retval); 
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
   NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);

mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp

@@ -1,41 +1,25 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsHTMLLinkAccessible.h"
 #include "nsWeakReference.h"
@@ -54,7 +38,7 @@ nsLinkableAccessible(aDomNode, aShell)
 }
 
 /* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAWritableString& _retval)
 { 
   if (!IsALink())  // Also initializes private data members
     return NS_ERROR_FAILURE;
@@ -62,7 +46,7 @@ NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAString& _retval)
   nsAutoString name;
   nsresult rv = AppendFlatStringFromSubtree(mLinkContent, &name);
   if (NS_SUCCEEDED(rv)) {
-    // Temp var needed until CompressWhitespace built for nsAString
+    // Temp var needed until CompressWhitespace built for nsAWritableString
     name.CompressWhitespace();
     _retval.Assign(name);
   }

mozilla/accessible/src/html/nsHTMLLinkAccessible.h

@@ -1,54 +1,37 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
+ * Contributor(s): 
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ */
 
 #ifndef _nsHTMLLinkAccessible_H_
 #define _nsHTMLLinkAccessible_H_
 
 #include "nsAccessible.h"
-#include "nsBaseWidgetAccessible.h"
 
 class nsHTMLLinkAccessible : public nsLinkableAccessible
 {
 
 public:
   nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
   NS_IMETHOD GetAccRole(PRUint32 *_retval); 
 };
 

mozilla/accessible/src/html/nsHTMLSelectAccessible.h

@@ -1,224 +1,72 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Original Author: Eric Vaughan (evaughan@netscape.com)
  *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 #ifndef __nsHTMLSelectAccessible_h__
 #define __nsHTMLSelectAccessible_h__
 
+#include "nsAccessible.h"
 #include "nsCOMPtr.h"
+#include "nsIAtom.h"
 #include "nsIAccessibleSelectable.h"
-#include "nsIDOMNode.h"
-#include "nsIWeakReference.h"
-#include "nsSelectAccessible.h"
 
-/**
-  * Selects, Listboxes and Comboboxes, are made up of a number of different
-  *  widgets, some of which are shared between the two. This file contains 
-  *  all of the widgets for both of the Selects, for HTML only. Some of them
-  *  extend classes from nsSelectAccessible.cpp, which contains base classes 
-  *  that are also extended by the XUL Select Accessibility support.
-  *
-  *  Listbox:
-  *     - nsHTMLListboxAccessible
-  *        - nsHTMLSelectListAccessible
-  *           - nsHTMLSelectOptionAccessible
-  *
-  *  Comboboxes:
-  *     - nsHTMLComboboxAccessible
-  *        - nsHTMLComboboxTextFieldAccessible
-  *        - nsHTMLComboboxButtonAccessible
-  *        - nsHTMLComboboxWindowAccessible
-  *           - nsHTMLSelectListAccessible
-  *              - nsHTMLSelectOptionAccessible(s)
-  */
-
-/** ------------------------------------------------------ */
-/**  First, the common widgets                             */
-/** ------------------------------------------------------ */
-
-/*
- * The list that contains all the options in the select.
- */
-class nsHTMLSelectListAccessible : public nsSelectListAccessible
-{
-public:
-  
-  nsHTMLSelectListAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLSelectListAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *aAccChildCount) ;
-
-};
-
-/*
- * Options inside the select, contained within the list
- */
-class nsHTMLSelectOptionAccessible : public nsSelectOptionAccessible
-{
-public:
-  
-  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLSelectOptionAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-
-  static nsresult GetFocusedOptionNode(nsIDOMNode *aListNode, nsCOMPtr<nsIDOMNode>& aFocusedOptionNode);
-
-};
-
-/*
- * Opt Groups inside the select, contained within the list
- */
-class nsHTMLSelectOptGroupAccessible : public nsHTMLSelectOptionAccessible
-{
-public:
-
-  nsHTMLSelectOptGroupAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLSelectOptGroupAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-};
-
-/** ------------------------------------------------------ */
-/**  Secondly, the Listbox widget                          */
-/** ------------------------------------------------------ */
-
-/*
- * A class the represents the HTML Listbox widget.
- */
-class nsHTMLListboxAccessible : public nsListboxAccessible,
-                                public nsIAccessibleSelectable  
+class nsHTMLSelectAccessible : public nsAccessible,
+                               public nsIAccessibleSelectable  
 {
 public:
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIACCESSIBLESELECTABLE
   
-  nsHTMLListboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLListboxAccessible() {}
+  nsHTMLSelectAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLSelectAccessible() {}
 
-  /* ----- nsIAccessible ----- */
   NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
   NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
 
-};
-
-/** ------------------------------------------------------ */
-/**  Finally, the Combobox widgets                         */
-/** ------------------------------------------------------ */
-
-/*
- * A class the represents the HTML Combobox widget.
- */
-class nsHTMLComboboxAccessible : public nsComboboxAccessible
-{
-public:
-
-  nsHTMLComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLComboboxAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+// helper method to verify frames
+  static PRBool IsCorrectFrame( nsIFrame* aFrame, nsIAtom* aAtom );
 
 };
 
 /*
- * A class the represents the text field in the Select to the left
- *     of the drop down button
+ * Each option in the Select. These are in the nsListAccessible
  */
-class nsHTMLComboboxTextFieldAccessible  : public nsComboboxTextFieldAccessible
+class nsHTMLSelectOptionAccessible : public nsLeafAccessible
 {
 public:
   
-  nsHTMLComboboxTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLComboboxTextFieldAccessible() {}
+  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
 
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-
-};
-
-/**
-  * A class that represents the button inside the Select to the
-  *     right of the text field
-  */
-class nsHTMLComboboxButtonAccessible  : public nsComboboxButtonAccessible
-{
-public:
-
-  nsHTMLComboboxButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLComboboxButtonAccessible() {}
-
-  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
   NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
   NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
 
+  nsCOMPtr<nsIAccessible> mParent;
 };
 
-/*
- * A class that represents the window that lives to the right
- * of the drop down button inside the Select. This is the window
- * that is made visible when the button is pressed.
- */
-class nsHTMLComboboxWindowAccessible : public nsComboboxWindowAccessible
-{
-public:
-
-  nsHTMLComboboxWindowAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLComboboxWindowAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-
-};
-
-
 #endif

mozilla/accessible/src/html/nsHTMLTableAccessible.cpp

@@ -1,101 +1,51 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsHTMLTableAccessible.h"
 #include "nsWeakReference.h"
 #include "nsReadableUtils.h"
-#include "nsIDOMElement.h"
 
 nsHTMLTableCellAccessible::nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsBlockAccessible(aDomNode, aShell)
+nsHTMLBlockAccessible(aDomNode, aShell)
 { 
 }
 
 /* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccRole(PRUint32 *aResult)
+NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccRole(PRUint32 *_retval)
 {
-  *aResult = ROLE_CELL;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccState(PRUint32 *aResult)
-{
-  nsAccessible::GetAccState(aResult);
-  *aResult &= ~STATE_FOCUSABLE;   // Inherit all states except focusable state since table cells cannot be focused
+  *_retval = ROLE_CELL;
   return NS_OK;
 }
 
 nsHTMLTableAccessible::nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsBlockAccessible(aDomNode, aShell)
+nsHTMLBlockAccessible(aDomNode, aShell)
 { 
 }
 
 /* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTableAccessible::GetAccRole(PRUint32 *aResult)
+NS_IMETHODIMP nsHTMLTableAccessible::GetAccRole(PRUint32 *_retval)
 {
-  *aResult = ROLE_TABLE;
+  *_retval = ROLE_TABLE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLTableAccessible::GetAccState(PRUint32 *aResult)
-{
-  nsAccessible::GetAccState(aResult);
-  *aResult &= ~STATE_FOCUSABLE;   // Inherit all states except focusable state since tables cannot be focused
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLTableAccessible::GetAccName(nsAString& aResult)
-{
-  aResult.Assign(NS_LITERAL_STRING(""));  // Default name is blank
-
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  if (element) {
-    nsCOMPtr<nsIDOMNodeList> captions;
-    element->GetElementsByTagName(NS_LITERAL_STRING("caption"), getter_AddRefs(captions));
-    if (captions) {
-      nsCOMPtr<nsIDOMNode> captionNode;
-      captions->Item(0, getter_AddRefs(captionNode));
-      if (captionNode) {
-        nsCOMPtr<nsIContent> captionContent(do_QueryInterface(captionNode));
-        AppendFlatStringFromSubtree(captionContent, &aResult);
-      }
-    }
-  }
-  return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLTableAccessible.h

@@ -1,64 +1,44 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsHTMLTableAccessible_H_
 #define _nsHTMLTableAccessible_H_
 
 #include "nsAccessible.h"
-#include "nsBaseWidgetAccessible.h"
 
-class nsHTMLTableCellAccessible : public nsBlockAccessible
+class nsHTMLTableCellAccessible : public nsHTMLBlockAccessible
 {
 public:
   nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *aResult); 
-  NS_IMETHOD GetAccState(PRUint32 *aResult); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
 };
 
 
-class nsHTMLTableAccessible : public nsBlockAccessible
+class nsHTMLTableAccessible : public nsHTMLBlockAccessible
 {
 public:
   nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *aResult); 
-  NS_IMETHOD GetAccState(PRUint32 *aResult); 
-  NS_IMETHOD GetAccName(nsAString& aResult);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
 };
 
 #endif  

mozilla/accessible/src/html/nsHTMLTextAccessible.cpp

@@ -1,51 +1,74 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
  * Author: Eric Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #include "nsHTMLTextAccessible.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+#include "nsString.h"
+#include "nsILink.h"
+#include "nsILinkHandler.h"
+#include "nsISelection.h"
+#include "nsISelectionController.h"
+#include "nsIPresContext.h"
+#include "nsReadableUtils.h"
 
 nsHTMLTextAccessible::nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsTextAccessible(aDomNode, aShell)
+nsLinkableAccessible(aDomNode, aShell)
 { 
 }
 
 /* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval)
 { 
+
   return mDOMNode->GetNodeValue(_retval);
 }
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_TEXT;
+
+  return NS_OK;
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}

mozilla/accessible/src/html/nsHTMLTextAccessible.h

@@ -1,54 +1,43 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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/
+ * 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.
+ * 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.
+ * 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):
- *
- *
- * 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 ***** */
+ * Contributor(s): 
+ */
 
 #ifndef _nsHTMLTextAccessible_H_
 #define _nsHTMLTextAccessible_H_
 
-#include "nsFormControlAccessible.h"
+#include "nsAccessible.h"
 
 class nsIWeakReference;
+class nsITextControlFrame;
 
-class nsHTMLTextAccessible : public nsTextAccessible
+class nsHTMLTextAccessible : public nsLinkableAccessible
 {
 
 public:
   nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
 };
 
 #endif  

mozilla/accessible/src/jar.mn

@@ -0,0 +1,3 @@
+en-US.jar:
+	locale/en-US/global/accessible.properties
+

mozilla/accessible/src/makefile.win

@@ -17,18 +17,48 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): John Gaunt (jgaunt@netscape.com)
+# Contributor(s): 
 
-DEPTH = ..\..
+DEPTH=..\..
+MODULE=accessibility
+LIBRARY_NAME=accessibility_s
 
-include <$(DEPTH)\config\config.mak>
-
-DIRS = \
-  base \
-  html \
-!ifdef MOZ_XUL
-  xul \
-!endif
+CPP_OBJS=\
+        .\$(OBJDIR)\nsAccessible.obj    \
+        .\$(OBJDIR)\nsRootAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLIFrameRootAccessible.obj    \
+        .\$(OBJDIR)\nsAccessibilityService.obj    \
+        .\$(OBJDIR)\nsHTMLSelectListAccessible.obj    \
+        .\$(OBJDIR)\nsGenericAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLFormControlAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLTextAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLImageAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLAreaAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLTableAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLLinkAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLComboboxAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLListboxAccessible.obj    \
   $(NULL)
 
+EXPORTS = \
+  .\nsRootAccessible.h \
+  $(NULL)
+
+LINCS=                                  \
+  -I..\..\layout\html\forms\public \
+  -I..\..\layout\html\forms\src \
+  -I..\..\layout\html\base\src \
+  $(NULL)
+
+
 include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+
+
+
+

mozilla/accessible/src/nsAccessibilityService.cpp

@@ -0,0 +1,685 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsIAccessibilityService.h"
+#include "nsAccessibilityService.h"
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsRootAccessible.h"
+#include "nsINameSpaceManager.h"
+#include "nsLayoutAtoms.h"
+#include "nsIDOMNode.h"
+#include "nsHTMLTextAccessible.h"
+#include "nsHTMLTableAccessible.h"
+#include "nsHTMLImageAccessible.h"
+#include "nsHTMLAreaAccessible.h"
+#include "nsHTMLLinkAccessible.h"
+#include "nsHTMLSelectListAccessible.h"
+#include "nsHTMLComboboxAccessible.h"
+#include "nsHTMLListboxAccessible.h"
+#include "nsIDOMHTMLAreaElement.h"
+#include "nsHTMLFormControlAccessible.h"
+#include "nsILink.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMHTMLOptionElement.h"
+
+// IFrame
+#include "nsIDocShell.h"
+#include "nsHTMLIFrameRootAccessible.h"
+
+//--------------------
+
+
+nsAccessibilityService::nsAccessibilityService()
+{
+  NS_INIT_REFCNT();
+}
+
+nsAccessibilityService::~nsAccessibilityService()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIAccessibilityService methods:
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
+{
+  // XXX - jgaunt - looks like we aren't using this
+  //nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
+
+  nsCOMPtr<nsIPresContext> presContext(do_QueryInterface(aPresContext));
+  NS_ASSERTION(presContext,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> presShell;
+  presContext->GetShell(getter_AddRefs(presShell));
+
+  NS_ASSERTION(presShell,"Error not presshell!!");
+
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(presShell));
+
+  *_retval = new nsRootAccessible(weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLComboboxAccessible(nsIDOMNode* aDOMNode, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIPresContext> presContext(do_QueryInterface(aPresContext));
+  NS_ASSERTION(presContext,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> presShell;
+  presContext->GetShell(getter_AddRefs(presShell)); 
+
+  nsCOMPtr<nsIWeakReference> weakShell = do_GetWeakReference(presShell);
+
+  *_retval = new nsHTMLComboboxAccessible(aDOMNode, weakShell);
+  if (! *_retval)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLListboxAccessible(nsIDOMNode* aDOMNode, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIPresContext> presContext(do_QueryInterface(aPresContext));
+  NS_ASSERTION(presContext,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> presShell;
+  presContext->GetShell(getter_AddRefs(presShell)); 
+
+  nsCOMPtr<nsIWeakReference> weakShell = do_GetWeakReference(presShell);
+
+  *_retval = new nsHTMLListboxAccessible(aDOMNode, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLSelectOptionAccessible(nsIDOMNode* aDOMNode, nsIAccessible *aAccParent, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIPresContext> presContext(do_QueryInterface(aPresContext));
+  NS_ASSERTION(presContext,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> presShell;
+  presContext->GetShell(getter_AddRefs(presShell)); 
+
+  nsCOMPtr<nsIWeakReference> weakShell = do_GetWeakReference(presShell);
+
+  *_retval = new nsHTMLSelectOptionAccessible(aAccParent, aDOMNode, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLCheckboxAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMRadioButtonAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLRadioButtonAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMLButtonAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLButtonAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTML4ButtonAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTML4ButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTML4ButtonAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLTextAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+
+/* nsIAccessible createHTMLTableAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLTableAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLTableAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMLTableCellAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLTableCellAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLTableCellAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMLImageAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLImageAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+  nsIImageFrame* imageFrame = nsnull;
+  
+  // not using a nsCOMPtr frames don't support them.
+  aFrame->QueryInterface(NS_GET_IID(nsIImageFrame), (void**)&imageFrame);
+
+  if (!imageFrame)
+    return NS_ERROR_FAILURE;
+
+  *_retval = new nsHTMLImageAccessible(node, imageFrame, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMLAreaAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLAreaAccessible(nsIWeakReference *aShell, nsIDOMNode *aDOMNode, nsIAccessible *aAccParent, 
+                                                               nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLAreaAccessible(aDOMNode, aAccParent, aShell);
+
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/* nsIAccessible createHTMLTextFieldAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextFieldAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLTextFieldAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aNode)
+{
+  NS_ASSERTION(aFrame,"Error -- 1st argument (aFrame) is null!!");
+  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
+  nsCOMPtr<nsIContent> content;
+  (*aRealFrame)->GetContent(getter_AddRefs(content));
+  nsCOMPtr<nsIDOMNode> node(do_QueryInterface(content));
+  *aNode = node;
+  NS_IF_ADDREF(*aNode);
+
+  nsCOMPtr<nsIDocument> document;
+  content->GetDocument(*getter_AddRefs(document));
+  if (!document)
+    return NS_ERROR_FAILURE;
+
+#ifdef DEBUG
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+#endif
+
+  // do_GetWR only works into a |nsCOMPtr| :-(
+  nsCOMPtr<nsIPresShell> tempShell;
+  nsCOMPtr<nsIWeakReference> weakShell;
+  document->GetShellAt(0, getter_AddRefs(tempShell));
+  weakShell = do_GetWeakReference(tempShell);
+  NS_IF_ADDREF(*aShell = weakShell);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateAccessible(nsIDOMNode* aDOMNode, nsISupports* aDocument, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIDocument> document (do_QueryInterface(aDocument));
+  if (!document)
+    return NS_ERROR_FAILURE;
+
+#ifdef DEBUG
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+#endif
+
+  nsCOMPtr<nsIPresShell> tempShell;
+  document->GetShellAt(0, getter_AddRefs(tempShell));
+  nsCOMPtr<nsIWeakReference> weakShell = do_GetWeakReference(tempShell);
+
+  *_retval = new nsAccessible(aDOMNode, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLBlockAccessible(nsIDOMNode* aDOMNode, nsISupports* aDocument, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIDocument> document (do_QueryInterface(aDocument));
+  if (!document)
+    return NS_ERROR_FAILURE;
+
+#ifdef DEBUG
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+#endif
+
+  nsCOMPtr<nsIPresShell> tempShell;
+  document->GetShellAt(0, getter_AddRefs(tempShell));
+  nsCOMPtr<nsIWeakReference> weakShell = do_GetWeakReference(tempShell);
+
+  *_retval = new nsAccessible(aDOMNode, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLIFrameAccessible(nsIDOMNode* aDOMNode, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+
+  nsCOMPtr<nsIContent> content(do_QueryInterface(aDOMNode));
+  NS_ASSERTION(content,"Error non nsIContent passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresContext> presContext(do_QueryInterface(aPresContext));
+  NS_ASSERTION(presContext,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> presShell;
+  presContext->GetShell(getter_AddRefs(presShell)); 
+  NS_ASSERTION(presShell,"Error non PresShell passed to accessible factory!!!");
+
+  nsCOMPtr<nsIWeakReference> weakRef = do_GetWeakReference(presShell);
+
+  nsCOMPtr<nsIDocument> doc;
+  if (NS_SUCCEEDED(content->GetDocument(*getter_AddRefs(doc))) && doc) {
+    nsCOMPtr<nsIPresShell> presShell;
+    doc->GetShellAt(0, getter_AddRefs(presShell));
+    if (presShell) {
+      nsCOMPtr<nsISupports> supps;
+      presShell->GetSubShellFor(content, getter_AddRefs(supps));
+      if (supps) {
+        nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(supps));
+        if (docShell) {
+          nsCOMPtr<nsIPresShell> ps;
+          docShell->GetPresShell(getter_AddRefs(ps));
+          if (ps) {
+            nsCOMPtr<nsIWeakReference> wr = do_GetWeakReference(ps);
+            nsCOMPtr<nsIDocument> innerDoc;
+            ps->GetDocument(getter_AddRefs(innerDoc)); 
+            if (innerDoc) {
+              nsCOMPtr<nsIAccessible> root = new nsHTMLIFrameRootAccessible(aDOMNode, wr);
+              if ( root ) {
+                nsHTMLIFrameAccessible* frameAcc = new nsHTMLIFrameAccessible(aDOMNode, root, weakRef, innerDoc);
+                if ( frameAcc != nsnull ) {
+                  *_retval = NS_STATIC_CAST(nsIAccessible*, frameAcc);
+                  if ( *_retval ) {
+                    NS_ADDREF(*_retval);
+                    return NS_OK;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//-----------------------------------------------------------------------
+ // This method finds the content node in the parent document
+ // corresponds to the docshell
+ // This code is copied and pasted from nsEventStateManager.cpp
+ // Is also inefficient - better solution should come along as part of 
+ // Bug 85602: "FindContentForDocShell walks entire content tree"
+ // Hopefully there will be a better method soon, with a public interface
+
+ nsIContent* 
+ nsAccessibilityService::FindContentForDocShell(nsIPresShell* aPresShell,
+                                             nsIContent*   aContent,
+                                             nsIDocShell*  aDocShell)
+ {
+   NS_ASSERTION(aPresShell, "Pointer is null!");
+   NS_ASSERTION(aDocShell,  "Pointer is null!");
+   NS_ASSERTION(aContent,   "Pointer is null!");
+ 
+   nsCOMPtr<nsISupports> supps;
+   aPresShell->GetSubShellFor(aContent, getter_AddRefs(supps));
+   if (supps) {
+     nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(supps));
+     if (docShell.get() == aDocShell) 
+       return aContent;
+   }
+ 
+   // walk children content
+   PRInt32 count;
+   aContent->ChildCount(count);
+   for (PRInt32 i=0;i<count;i++) {
+     nsCOMPtr<nsIContent> child;
+     aContent->ChildAt(i, *getter_AddRefs(child));
+     nsIContent* foundContent = FindContentForDocShell(aPresShell, child, aDocShell);
+     if (foundContent != nsnull) {
+       return foundContent;
+     }
+   }
+   return nsnull;
+ }
+
+void nsAccessibilityService::GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent)
+{
+  nsCOMPtr<nsIPresContext> presContext;
+  aPresShell->GetPresContext(getter_AddRefs(presContext));
+  if (!presContext) 
+    return;
+  nsCOMPtr<nsISupports> pcContainer;
+  presContext->GetContainer(getter_AddRefs(pcContainer));
+  if (!pcContainer) 
+    return;
+  nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(pcContainer));
+
+  nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(docShell));
+  if (!treeItem) 
+    return;
+
+  // Get Parent Doc
+  nsCOMPtr<nsIDocShellTreeItem> treeItemParent;
+  treeItem->GetParent(getter_AddRefs(treeItemParent));
+  if (!treeItemParent) 
+    return;
+
+  nsCOMPtr<nsIDocShell> parentDS(do_QueryInterface(treeItemParent));
+  if (!parentDS) 
+    return;
+
+  nsCOMPtr<nsIPresShell> parentPresShell;
+  parentDS->GetPresShell(getter_AddRefs(parentPresShell));
+  if (!parentPresShell) 
+    return;
+
+  nsCOMPtr<nsIDocument> parentDoc;
+  parentPresShell->GetDocument(getter_AddRefs(parentDoc));
+  if (!parentDoc)
+    return;
+
+  nsCOMPtr<nsIContent> rootContent;
+  parentDoc->GetRootContent(getter_AddRefs(rootContent));
+  
+  nsIContent *tempContent;
+  tempContent = FindContentForDocShell(parentPresShell, rootContent, docShell);
+  if (tempContent) {
+    *aOwnerContent = tempContent;
+    *aOwnerShell = parentPresShell;
+    NS_ADDREF(*aOwnerShell);
+    NS_ADDREF(*aOwnerContent);
+  }
+}
+
+/* -------------------------------------------------------
+ * GetAccessibleFor - get an nsIAccessible from a DOM node
+ * ------------------------------------------------------- */
+
+NS_IMETHODIMP nsAccessibilityService::GetAccessibleFor(nsIDOMNode *aNode, 
+                                                       nsIAccessible **_retval) 
+{
+  *_retval = nsnull;
+
+  if (!aNode)
+    return NS_ERROR_NULL_POINTER;
+
+  // ---- Get the document for this node  ----
+  nsCOMPtr<nsIDocument> doc;
+  nsCOMPtr<nsIDocument> nodeIsDoc(do_QueryInterface(aNode));
+  if (nodeIsDoc)
+    doc = nodeIsDoc;
+  else {
+    nsCOMPtr<nsIDOMDocument> domDoc;
+    aNode->GetOwnerDocument(getter_AddRefs(domDoc));
+    if (!domDoc)
+      return NS_ERROR_INVALID_ARG;
+    doc = do_QueryInterface(domDoc);
+  }
+  if (!doc)
+    return NS_ERROR_INVALID_ARG;
+
+  // ---- Get the pres shell ----
+  nsCOMPtr<nsIPresShell> shell;
+  doc->GetShellAt(0, getter_AddRefs(shell));
+  if (!shell)
+    return NS_ERROR_FAILURE;
+
+  // ---- Check if area node ----
+  nsCOMPtr<nsIDOMHTMLAreaElement> areaContent(do_QueryInterface(aNode));
+  if (areaContent)   // Area elements are implemented in nsHTMLImageAccessible as children of the image
+    return PR_FALSE; // Return, otherwise the image frame looks like an accessible object in the wrong place
+
+  // ---- Check if we need outer owning doc ----
+  nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
+  if (!content && nodeIsDoc) {
+    // This happens when we're on the document node, which will not QI to an nsIContent, 
+    // When that happens, we try to get the outer, parent document node that contains the document
+    // For example, a <browser> or <iframe> element
+    nsCOMPtr<nsIPresShell> ownerShell;
+    nsCOMPtr<nsIContent> ownerContent;
+    GetOwnerFor(shell, getter_AddRefs(ownerShell), getter_AddRefs(ownerContent));
+    shell = ownerShell;
+    content = ownerContent;
+  }
+
+  // ---- If still no nsIContent, return ----
+  if (!content)
+    return PR_FALSE;
+
+  // ---- Try using frame to get IAccessible ----
+  nsIFrame* frame = nsnull;
+  shell->GetPrimaryFrameFor(content, &frame);
+  if (!frame)
+    return PR_FALSE;
+
+  nsCOMPtr<nsIAccessible> newAcc;
+  frame->GetAccessible(getter_AddRefs(newAcc));
+
+  // ---- Try QI'ing node to get nsIAccessible ----
+  if (!newAcc)
+    newAcc = do_QueryInterface(aNode);
+
+  // ---- If link, create link accessible ----
+  if (!newAcc) {
+    // is it a link?
+    nsCOMPtr<nsILink> link(do_QueryInterface(aNode));
+    if (link) {
+      nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(shell));
+      newAcc = new nsHTMLLinkAccessible(aNode, weakShell);
+    }
+  }
+
+  // ---- If <select> option, create select option accessible
+  if (!newAcc) {
+    nsCOMPtr<nsIDOMHTMLOptionElement> optionElement(do_QueryInterface(aNode));
+    if (optionElement) {
+      // nsHTMLSelectionOptionAccessible's must be created via the parent
+      nsCOMPtr<nsIDOMNode> parentNode;
+      aNode->GetParentNode(getter_AddRefs(parentNode));
+      if (parentNode) {
+        nsCOMPtr<nsIAccessible> parentAccessible;
+        GetAccessibleFor(parentNode, getter_AddRefs(parentAccessible));
+        if (parentAccessible) {
+          nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(shell));
+          newAcc = new nsHTMLSelectOptionAccessible(parentAccessible, aNode, weakShell);
+        }
+      }
+    }
+  }
+
+  if (!newAcc)
+    return NS_ERROR_FAILURE;
+
+  *_retval = newAcc;
+  NS_ADDREF(*_retval);
+
+  return NS_OK;
+}
+
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewAccessibilityService(nsIAccessibilityService** aResult)
+{
+  NS_PRECONDITION(aResult != nsnull, "null ptr");
+  if (! aResult)
+      return NS_ERROR_NULL_POINTER;
+
+  nsAccessibilityService* accService = new nsAccessibilityService();
+  if (!accService)
+      return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(accService);
+  *aResult = accService;
+  return NS_OK;
+}
+

mozilla/accessible/src/nsAccessibilityService.h

@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ * 
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsAccessibilityService_h__
+#define __nsAccessibilityService_h__
+
+#include "nsIAccessibilityService.h"
+#include "nsIContent.h"
+#include "nsIPresShell.h"
+#include "nsIDocShell.h"
+
+class nsIFrame;
+class nsIWeakReference;
+class nsIDOMNode;
+
+class nsAccessibilityService : public nsIAccessibilityService
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIAccessibilityService methods:
+  NS_DECL_NSIACCESSIBILITYSERVICE
+
+  // nsAccessibilityService methods:
+  nsAccessibilityService();
+  virtual ~nsAccessibilityService();
+
+public:
+
+private:
+  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aContent);
+  void GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent);
+  nsIContent* FindContentForDocShell(nsIPresShell* aPresShell, nsIContent* aContent, nsIDocShell*  aDocShell);
+
+};
+
+#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/nsAccessible.h

@@ -0,0 +1,155 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+#ifndef _nsAccessible_H_
+#define _nsAccessible_H_
+
+#include "nsISupports.h"
+#include "nsGenericAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIContent.h"
+#include "nsIDOMNode.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsWeakReference.h"
+#include "nsIFocusController.h"
+#include "nsRect.h"
+#include "nsPoint.h"
+
+#define ACCESSIBLE_BUNDLE_URL "chrome://global/locale/accessible.properties"
+
+class nsIFrame;
+class nsIDocShell;
+class nsIWebShell;
+class nsIContent;
+
+class nsAccessible : public nsGenericAccessible
+{
+public:
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval); 
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval); 
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); 
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); 
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); 
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+  NS_IMETHOD GetAccFocused(nsIAccessible **_retval); 
+  NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval); 
+  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); 
+  NS_IMETHOD AccRemoveSelection(void); 
+  NS_IMETHOD AccTakeSelection(void); 
+  NS_IMETHOD AccTakeFocus(void); 
+  NS_IMETHOD AccGetDOMNode(nsIDOMNode **_retval); 
+
+  public:
+    nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+    virtual ~nsAccessible();
+
+    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
+
+    // Helper Routines for Sub-Docs
+    static nsresult GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
+    static nsresult GetDocShellObjects(nsIDocShell*     aDocShell,
+                                nsIPresShell**   aPresShell, 
+                                nsIPresContext** aPresContext, 
+                                nsIContent**     aContent);
+    static nsresult GetDocShells(nsIPresShell* aPresShell,
+                          nsIDocShell** aDocShell,
+                          nsIDocShell** aParentDocShell);
+    static nsresult GetParentPresShellAndContent(nsIPresShell*  aPresShell,
+                                          nsIPresShell** aParentPresShell,
+                                          nsIContent**   aSubShellContent);
+
+    static PRBool FindContentForWebShell(nsIPresShell* aParentPresShell,
+                                  nsIContent*   aParentContent,
+                                  nsIWebShell*  aWebShell,
+                                  nsIContent**  aFoundContent);
+    nsresult CalcOffset(nsIFrame* aFrame,
+                        nsIPresContext * aPresContext,
+                        nsRect& aRect);
+    nsresult GetAbsPosition(nsIPresShell* aPresShell, nsPoint& aPoint);
+    nsresult GetAbsoluteFramePosition(nsIPresContext* aPresContext,
+                                      nsIFrame *aFrame, 
+                                      nsRect& aAbsoluteTwipsRect, 
+                                      nsRect& aAbsolutePixelRect);
+    static nsresult GetTranslatedString(PRUnichar *aKey, nsAWritableString *aStringOut);
+
+    // helper method to verify frames
+    static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom);
+
+protected:
+  virtual nsIFrame* GetFrame();
+  virtual nsIFrame* GetBoundsFrame();
+  virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
+  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
+  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString);
+  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString);
+
+  // Data Members
+  nsCOMPtr<nsIDOMNode> mDOMNode;
+  nsCOMPtr<nsIWeakReference> mPresShell;
+  nsCOMPtr<nsIFocusController> mFocusController;
+
+};
+
+/* Special Accessible that knows how to handle hit detection for flowing text */
+class nsHTMLBlockAccessible : public nsAccessible
+{
+public:
+   nsHTMLBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
+};
+
+/* Leaf version of DOM Accessible
+ * has no children
+ */
+class nsLeafAccessible : public nsAccessible
+{
+  public:
+    nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+
+    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+};
+
+
+class nsLinkableAccessible : public nsAccessible
+{
+  public:
+    nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+    NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+    NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+    NS_IMETHOD AccDoAction(PRUint8 index);
+    NS_IMETHOD GetAccState(PRUint32 *_retval);
+    NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+
+  protected:
+    PRBool IsALink();
+    PRBool mIsALinkCached;  // -1 = unknown, 0 = not a link, 1 = is a link
+    nsCOMPtr<nsIContent> mLinkContent;
+    PRBool mIsLinkVisited;
+};
+
+
+#endif  

mozilla/accessible/src/nsGenericAccessible.cpp

@@ -0,0 +1,225 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsGenericAccessible.h"
+#include "nsIFrame.h"
+#include "nsCOMPtr.h"
+#include "nsIWeakReference.h"
+#include "nsISelectionController.h"
+#include "nsReadableUtils.h"
+#include "nsIContent.h"
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
+
+nsGenericAccessible::nsGenericAccessible()
+{
+  NS_INIT_ISUPPORTS();
+  /* member initializers and constructor code */
+}
+
+nsGenericAccessible::~nsGenericAccessible()
+{
+  /* destructor code */
+}
+
+/* nsIAccessible getAccParent (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccNextSibling (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccPreviousSibling (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAWritableString& _retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccValue (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void setAccName (in wstring name); */
+NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAReadableString& name)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccDescription (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAWritableString& _retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccState (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsGenericAccessible::AccDoAction(PRUint8 index)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccFocused(); */
+NS_IMETHODIMP nsGenericAccessible::GetAccFocused(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccHelp (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAWritableString& _retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accGetAt (in long x, in long y); */
+NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateRight (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateLeft (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateUp (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateDown (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accGetBounds (out long x, out long y, out long width, out long height); */
+NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accAddSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accRemoveSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accExtendSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accTakeSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accTakeFocus (); */
+NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long getAccExtState (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsGenericAccessible::AccGetDOMNode(nsIDOMNode **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+

mozilla/accessible/src/nsGenericAccessible.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Eric D Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsGenericAccessible_H_
+#define _nsGenericAccessible_H_
+
+#include "nsISupports.h"
+#include "nsIAccessible.h"
+#include "nsIContent.h"
+#include "nsIDOMNode.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsCOMPtr.h"
+#include "nsIWeakReference.h"
+
+/**
+ * Basic implementation
+ * supports nothing
+ */
+class nsGenericAccessible : public nsIAccessible
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIACCESSIBLE
+
+  public:
+    nsGenericAccessible();
+    virtual ~nsGenericAccessible();
+};
+
+
+#endif  

mozilla/accessible/src/nsHTMLAreaAccessible.cpp

@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsGenericAccessible.h"
+#include "nsHTMLAreaAccessible.h"
+#include "nsReadableUtils.h"
+#include "nsString.h"
+#include "nsAccessible.h"
+#include "nsIAccessibilityService.h"
+#include "nsIServiceManager.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMHTMLAreaElement.h"
+#include "nsGUIEvent.h"
+
+
+// --- area -----
+
+nsHTMLAreaAccessible::nsHTMLAreaAccessible(nsIDOMNode *aDomNode, nsIAccessible *aAccParent, nsIWeakReference* aShell):
+nsLinkableAccessible(aDomNode, aShell), mAccParent(aAccParent)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAWritableString & _retval)
+{
+  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
+  if (elt) {
+    nsAutoString hrefString;
+    elt->GetAttribute(NS_LITERAL_STRING("title"), _retval);
+  }
+  return NS_OK;
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_LINK;
+  return NS_OK;
+}
+
+/* wstring getAccValue (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
+  if (elt) 
+    elt->GetAttribute(NS_LITERAL_STRING("href"), _retval);
+  return NS_OK;
+}
+
+/* wstring getAccDescription (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAWritableString& _retval)
+{
+  // Still to do - follow IE's standard here
+  nsCOMPtr<nsIDOMHTMLAreaElement> area(do_QueryInterface(mDOMNode));
+  if (area) 
+    area->GetShape(_retval);
+  return NS_OK;
+}
+
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccParent(nsIAccessible * *aAccParent) 
+{ 
+  *aAccParent = mAccParent;
+  NS_IF_ADDREF(*aAccParent);
+  return NS_OK;
+}
+
+nsIAccessible *nsHTMLAreaAccessible::CreateAreaAccessible(nsIDOMNode *aDOMNode)
+{
+  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
+  if (accService) {
+    nsIAccessible* acc = nsnull;
+    accService->CreateHTMLAreaAccessible(mPresShell, aDOMNode, mAccParent, &acc);
+    return acc;
+  }
+  return nsnull;
+
+}
+
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
+{ 
+  *aAccNextSibling = nsnull;
+  nsCOMPtr<nsIDOMNode> nextNode;
+  mDOMNode->GetNextSibling(getter_AddRefs(nextNode));
+  if (nextNode)
+    *aAccNextSibling = CreateAreaAccessible(nextNode);
+  return NS_OK;  
+}
+
+/* readonly attribute nsIAccessible accPreviousSibling; */
+NS_IMETHODIMP nsHTMLAreaAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPrevSibling) 
+{
+  *aAccPrevSibling = nsnull;
+  nsCOMPtr<nsIDOMNode> prevNode;
+  mDOMNode->GetPreviousSibling(getter_AddRefs(prevNode));
+  if (prevNode)
+    *aAccPrevSibling = CreateAreaAccessible(prevNode);
+  return NS_OK;  
+}
+
+
+/* void accGetBounds (out long x, out long y, out long width, out long height); */
+NS_IMETHODIMP nsHTMLAreaAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  //nsIFrame *frame;
+  // Do a better job on this later - need to use GetRect on mAreas of nsImageMap from nsImageFrame
+  //return mAccParent->nsAccessible::AccGetBounds(x,y,width,height);
+
+  *x = *y = *width = *height = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+

mozilla/accessible/src/nsHTMLAreaAccessible.h

@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLAreaAccessible_H_
+#define _nsHTMLAreaAccessible_H_
+
+#include "nsGenericAccessible.h"
+#include "nsAccessible.h"
+
+/* Accessible for image map areas - must be child of image
+ */
+
+class nsHTMLAreaAccessible : public nsLinkableAccessible
+{
+
+public:
+  nsHTMLAreaAccessible(nsIDOMNode *domNode, nsIAccessible *accParent, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString & _retval); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible * *aAccNextSibling);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling);
+  NS_IMETHOD GetAccDescription(nsAWritableString& _retval);
+  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
+
+protected:
+  nsIAccessible *CreateAreaAccessible(nsIDOMNode *aDOMNode);
+  nsCOMPtr<nsIAccessible> mAccParent;
+};
+
+#endif  

mozilla/accessible/src/nsHTMLComboboxAccessible.cpp

@@ -0,0 +1,728 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ *
+ * Contributor(s):  John Gaunt (jgaunt@netscape.com)
+ */
+
+#include "nsHTMLComboboxAccessible.h"
+
+#include "nsCOMPtr.h"
+#include "nsIComboboxControlFrame.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIFrame.h"
+#include "nsLayoutAtoms.h"
+
+/** ----- nsHTMLComboboxAccessible ----- */
+
+/**
+  * Constructor -- create the nsHTMLAccessible and set initial state
+  *                closed and not registered
+  */
+nsHTMLComboboxAccessible::nsHTMLComboboxAccessible(nsIDOMNode* aDOMNode, 
+                                                   nsIWeakReference* aShell)
+                         :nsAccessible(aDOMNode, aShell)
+{
+  mRegistered = PR_FALSE;
+  mOpen = PR_FALSE;
+  SetupMenuListener();
+}
+
+/**
+  * Destructor -- If we are registered, remove ourselves as a listener.
+  */
+nsHTMLComboboxAccessible::~nsHTMLComboboxAccessible()
+{
+  if (mRegistered) {
+    nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
+    if (eventReceiver) 
+      eventReceiver->RemoveEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE);   
+  }
+}
+
+/** Inherit the ISupports impl from nsAccessible -- handle nsIDOMXULListener ourself */
+NS_IMPL_ISUPPORTS_INHERITED(nsHTMLComboboxAccessible, nsAccessible, nsIDOMXULListener)
+
+/** 
+  * Tell our caller we are a combobox 
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_COMBOBOX;
+  return NS_OK;
+}
+
+/** 
+  * Through the arg, pass back our last child, a nsHTMLComboboxWindowAccessible object
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLComboboxWindowAccessible(this, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/** 
+  * Through the arg, pass back our first child, a nsHTMLComboboxTextFieldAccessible object
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLComboboxTextFieldAccessible(this, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  * We always have 3 children: TextField, Button, Window. In that order
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 3;
+  return NS_OK;
+}
+
+/**
+  * nsIAccessibleSelectable method. No-op because our selection is returned through
+  *     GetValue(). This _may_ change just to provide additional info for the vendors
+  *     and another option for them to get at stuff.
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetSelectedChildren(nsISupportsArray **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  * Our value is the value of our ( first ) selected child. SelectElement
+  *     returns this by default with GetValue().
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIDOMHTMLSelectElement> select (do_QueryInterface(mDOMNode));
+  if (select) {
+    select->GetValue(_retval);  
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+/**
+  * As a nsHTMLComboboxAccessible we can have the following states:
+  *     STATE_FOCUSED
+  *     STATE_READONLY
+  *     STATE_FOCUSABLE
+  *     STATE_HASPOPUP
+  *     STATE_EXPANDED
+  *     STATE_COLLAPSED
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccState(PRUint32 *_retval)
+{
+  // this sets either STATE_FOCUSED or 0
+  nsAccessible::GetAccState(_retval);
+
+  if (mOpen)
+    *_retval |= STATE_EXPANDED;
+  else
+    *_retval |= STATE_COLLAPSED;
+
+  *_retval |= STATE_HASPOPUP | STATE_READONLY | STATE_FOCUSABLE;
+
+  return NS_OK;
+}
+
+/**
+  * Set our state to open and (TBD) fire an event to MSAA saying our state
+  *     has changed.
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::PopupShowing(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_TRUE;
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+/**
+  * Set our state to not open and (TDB) fire an event to MSAA saying
+  *     our state has changed.
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::PopupHiding(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+/**
+  * Set our state to not open and (TDB) fire an event to MSAA saying
+  *     our state has changed.
+  */
+NS_IMETHODIMP nsHTMLComboboxAccessible::Close(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+/**
+  * If we aren't already registered, register ourselves as a
+  *     listener to "popupshowing" events on our DOM node. Set our
+  *     state to registered, but don't notify MSAA as they 
+  *     don't need to know about this state.
+  */
+void
+nsHTMLComboboxAccessible::SetupMenuListener()
+{
+  // if not already registered as a popup listener, register ourself
+  if (!mRegistered) {
+    nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
+    if (eventReceiver && NS_SUCCEEDED(eventReceiver->AddEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE)))
+      mRegistered = PR_TRUE;
+  }
+}
+
+
+/** ----- nsHTMLComboboxTextFieldAccessible ----- */
+
+/**
+  * Constructor -- create the nsLeafAccessible and set our parent
+  */
+nsHTMLComboboxTextFieldAccessible::nsHTMLComboboxTextFieldAccessible(nsIAccessible* aParent, 
+                                                                 nsIDOMNode* aDOMNode, 
+                                                                 nsIWeakReference* aShell)
+                                  :nsLeafAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+/**
+  * Currently gets the text from the first option, needs to check for selection
+  *     and then return that text.
+  *     Walks the Frame tree and checks for proper frames.
+  */
+NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+  if (!frame || !context)
+    return NS_ERROR_FAILURE;
+
+  frame->FirstChild(context, nsnull, &frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
+    return NS_ERROR_FAILURE;
+#endif
+
+  frame->FirstChild(context, nsnull, &frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::textFrame))
+    return NS_ERROR_FAILURE;
+#endif
+
+  nsCOMPtr<nsIContent> content;
+  frame->GetContent(getter_AddRefs(content));
+
+  if (!content) 
+    return NS_ERROR_FAILURE;
+
+  AppendFlatStringFromSubtree(content, &_retval);
+
+  return NS_OK;
+}
+
+/**
+  * Gets the bounds for the BlockFrame.
+  *     Walks the Frame tree and checks for proper frames.
+  */
+void nsHTMLComboboxTextFieldAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame)
+{
+  // get our first child's frame
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+  if (!frame || !context)
+    return;
+
+  frame->FirstChild(context, nsnull, aBoundingFrame);
+  frame->FirstChild(context, nsnull, &frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
+    return;
+#endif
+
+  frame->GetRect(aBounds);
+}
+
+/**
+  * Getter for our parent
+  */
+NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+
+/**
+  * Through the arg, pass back our next sibling, a 
+  *     nsHTMLComboboxButtonAccessible object
+  */
+NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLComboboxButtonAccessible(parent, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+/**
+  * We are the first child of our parent, no previous sibling
+  */
+NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+  return NS_OK;
+} 
+
+/**
+  * Our role is currently only static text, but we should be able to have
+  *     editable text here and we need to check that case.
+  */
+NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_STATICTEXT;
+  return NS_OK;
+}
+
+/**
+  * As a nsHTMLComboboxTextFieldAccessible we can have the following states:
+  *     STATE_READONLY
+  *     STATE_FOCUSED
+  *     STATE_FOCUSABLE
+  */
+NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetAccState(PRUint32 *_retval)
+{
+  // this sets either STATE_FOCUSED or 0
+  nsAccessible::GetAccState(_retval);
+
+  *_retval |= STATE_READONLY | STATE_FOCUSABLE;
+
+  return NS_OK;
+}
+
+
+/** -----SelectButtonAccessible ----- */
+
+/**
+  * Constructor -- create the nsMenuListenerAccessible and set our parent
+  */
+nsHTMLComboboxButtonAccessible::nsHTMLComboboxButtonAccessible(nsIAccessible* aParent, 
+                                                           nsIDOMNode* aDOMNode, 
+                                                           nsIWeakReference* aShell)
+                               :nsAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+/**
+  * Programmaticaly click on the button, causing either the display or
+  *     the hiding of the drop down box ( window ).
+  *     Walks the Frame tree and checks for proper frames.
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::AccDoAction(PRUint8 index)
+{
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+  if (!context)
+    return NS_ERROR_FAILURE;
+
+  frame->FirstChild(context, nsnull, &frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
+    return NS_ERROR_FAILURE;
+#endif
+
+  frame->GetNextSibling(&frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::gfxButtonControlFrame))
+    return NS_ERROR_FAILURE;
+#endif
+
+  nsCOMPtr<nsIContent> content;
+  frame->GetContent(getter_AddRefs(content));
+
+  // We only have one action, click. Any other index is meaningless(wrong)
+  if (index == eAction_Click) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(content));
+    if (element)
+    {
+       element->Click();
+       return NS_OK;
+    }
+    return NS_ERROR_FAILURE;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+
+/**
+  * Just one action ( click ).
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/**
+  * Gets the bounds for the gfxButtonControlFrame.
+  *     Walks the Frame tree and checks for proper frames.
+  */
+void nsHTMLComboboxButtonAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame)
+{
+  // get our second child's frame
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+  if (!context)
+    return;
+
+  frame->FirstChild(context, nsnull, &frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
+    return;
+#endif
+
+  frame->GetNextSibling(aBoundingFrame);
+  frame->GetNextSibling(&frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::gfxButtonControlFrame))
+    return;
+#endif
+
+  frame->GetRect(aBounds);
+}
+
+/**
+  * Tell our caller we are a button.
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PUSHBUTTON;
+  return NS_OK;
+}
+
+/**
+  * Getter for our parent
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+  *_retval = mParent;
+  NS_IF_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  * Gets the name from GetAccActionName()
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccName(nsAWritableString& _retval)
+{
+  return GetAccActionName(eAction_Click, _retval);
+}
+
+/**
+  * Our action name is the reverse of our state: 
+  *     if we are closed -> open is our name.
+  *     if we are open -> closed is our name.
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  // we are open or closed
+  PRBool isOpen = PR_FALSE;
+  nsIFrame *boundsFrame = GetBoundsFrame();
+  nsIComboboxControlFrame* comboFrame;
+  boundsFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboFrame);
+  if (!comboFrame)
+    return NS_ERROR_FAILURE;
+  comboFrame->IsDroppedDown(&isOpen);
+  if (isOpen)
+    _retval = NS_LITERAL_STRING("Close");
+  else
+    _retval = NS_LITERAL_STRING("Open");
+
+  return NS_OK;
+}
+
+/**
+  * Through the arg, pass back our next sibling, a 
+  *     nsHTMLComboboxWindowAccessible object
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLComboboxWindowAccessible(parent, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+/**
+  * Through the arg, pass back our previous sibling, a 
+  *     nsHTMLComboboxTextFieldAccessible object
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLComboboxTextFieldAccessible(parent, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+/**
+  * No Children. Just a button ( over-riding nsAccessible )
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  * No Children. Just a button ( over-riding nsAccessible )
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  * No Children. Just a button ( over-riding nsAccessible )
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}
+
+/**
+  * As a nsHTMLComboboxButtonAccessible we can have the following states:
+  *     STATE_PRESSED
+  *     STATE_FOCUSED
+  *     STATE_FOCUSABLE
+  */
+NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetAccState(PRUint32 *_retval)
+{
+  // this sets either STATE_FOCUSED or 0
+  nsAccessible::GetAccState(_retval);
+
+  // we are open or closed
+  PRBool isOpen = PR_FALSE;
+  nsIFrame *boundsFrame = GetBoundsFrame();
+  nsIComboboxControlFrame* comboFrame;
+  boundsFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboFrame);
+  if (!comboFrame)
+    return NS_ERROR_FAILURE;
+  comboFrame->IsDroppedDown(&isOpen);
+  if (isOpen)
+  *_retval |= STATE_PRESSED;
+
+  *_retval |= STATE_FOCUSABLE;
+
+  return NS_OK;
+}
+
+
+/** ----- nsHTMLComboboxWindowAccessible ----- */
+
+/**
+  * Constructor -- create the nsMenuListener and set our parent
+  */
+nsHTMLComboboxWindowAccessible::nsHTMLComboboxWindowAccessible(nsIAccessible* aParent, 
+                                                           nsIDOMNode* aDOMNode, 
+                                                           nsIWeakReference* aShell)
+                               :nsAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+/**
+  * As a nsHTMLComboboxWindowAccessible we can have the following states:
+  *     STATE_FOCUSED
+  *     STATE_FOCUSABLE
+  *     STATE_INVISIBLE
+  *     STATE_FLOATING
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccState(PRUint32 *_retval)
+{
+  // this sets either STATE_FOCUSED or 0
+  nsAccessible::GetAccState(_retval);
+
+  // we are open or closed
+  PRBool isOpen = PR_FALSE;
+  nsIFrame *boundsFrame = GetBoundsFrame();
+  nsIComboboxControlFrame* comboFrame = nsnull;
+  boundsFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboFrame);
+  if (!comboFrame)
+    return NS_ERROR_FAILURE;
+  comboFrame->IsDroppedDown(&isOpen);
+  if (! isOpen)
+    *_retval |= STATE_INVISIBLE;
+
+  *_retval |= STATE_FOCUSABLE | STATE_FLOATING;
+
+  return NS_OK;
+}
+
+/**
+  * Tell our caller we are a window
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_WINDOW;
+  return NS_OK;
+}
+
+/**
+  * Getter for our parent
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+ 
+/**
+  * Through the arg, pass back our previous sibling, a 
+  *     nsHTMLComboboxButtonAccessible object
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLComboboxButtonAccessible(parent, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+/**
+  * We are the last sibling of our parent.
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  * We only have one child, a list
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  * We only have one child, a list
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
+  if (! *_retval)
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  * We only have one child, a list
+  */
+NS_IMETHODIMP nsHTMLComboboxWindowAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/**
+  * Gets the bounds for the areaFrame.
+  *     Walks the Frame tree and checks for proper frames.
+  */
+void nsHTMLComboboxWindowAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame)
+{
+   // get our first option
+  nsCOMPtr<nsIDOMNode> child;
+  mDOMNode->GetFirstChild(getter_AddRefs(child));
+
+  // now get its frame
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell) {
+    *aBoundingFrame = nsnull;
+    return;
+  }
+
+  nsIFrame* frame = nsnull;
+  nsCOMPtr<nsIContent> content(do_QueryInterface(child));
+  shell->GetPrimaryFrameFor(content, &frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
+    return;
+#endif
+
+  frame->GetParent(aBoundingFrame);
+  frame->GetParent(&frame);
+#ifdef DEBUG
+  if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::areaFrame))
+    return;
+#endif
+
+  frame->GetRect(aBounds);
+}

mozilla/accessible/src/nsHTMLComboboxAccessible.h

@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: John Gaunt (jgaunt@netscape.com)
+ *
+ * Contributor(s):
+ */
+#ifndef __nsHTMLComboboxAccessible_h__
+#define __nsHTMLComboboxAccessible_h__
+
+#include "nsAccessible.h"
+#include "nsIAccessibleSelectable.h"
+
+#include "nsCOMPtr.h"
+#include "nsHTMLSelectListAccessible.h"
+#include "nsIDOMXULListener.h"
+
+/*
+ * A class the represents the HTML Combobox widget.
+ */
+class nsHTMLComboboxAccessible : public nsAccessible,
+                                 public nsIAccessibleSelectable,
+                                 public nsIDOMXULListener
+{
+public:
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIACCESSIBLESELECTABLE
+  
+  nsHTMLComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLComboboxAccessible();
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+  // popup listener
+  NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent);
+  NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent);
+  NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }
+  
+  NS_IMETHOD Close(nsIDOMEvent* aEvent);
+  NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+  virtual void SetupMenuListener();
+
+protected:
+
+  PRBool mRegistered;
+  PRBool mOpen;
+
+};
+
+/*
+ * A class the represents the text field in the Select to the left
+ *     of the drop down button
+ */
+class nsHTMLComboboxTextFieldAccessible  : public nsLeafAccessible
+{
+public:
+  
+  nsHTMLComboboxTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
+
+protected:
+  
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+/**
+  * A class that represents the button inside the Select to the
+  *     right of the text field
+  */
+class nsHTMLComboboxButtonAccessible  : public nsAccessible
+{
+public:
+
+  enum { eAction_Click=0 };
+  
+  nsHTMLComboboxButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
+
+protected:
+  
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+/*
+ * A class that represents the window that lives to the right
+ * of the drop down button inside the Select. This is the window
+ * that is made visible when the button is pressed.
+ */
+class nsHTMLComboboxWindowAccessible : public nsAccessible
+{
+public:
+
+  nsHTMLComboboxWindowAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
+   
+protected:
+  
+  nsCOMPtr<nsIAccessible> mParent; 
+};
+
+#endif

mozilla/accessible/src/nsHTMLFormControlAccessible.cpp

@@ -0,0 +1,467 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLFormControlAccessible.h"
+#include "nsWeakReference.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMHTMLTextAreaElement.h"
+#include "nsINameSpaceManager.h"
+#include "nsHTMLAtoms.h"
+#include "nsIDOMHTMLButtonElement.h"
+#include "nsReadableUtils.h"
+#include "nsString.h"
+#include "nsAccessible.h"
+#include "nsIFrame.h"
+#include "nsIDOMHTMLLabelElement.h"
+#include "nsIDOMHTMLFormElement.h"
+#include "nsISelectionController.h"
+
+nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsLeafAccessible(aNode, aShell)
+{ 
+}
+
+NS_IMETHODIMP nsHTMLFormControlAccessible::AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel)
+{
+  PRInt32 numChildren = 0;
+
+  nsCOMPtr<nsIDOMHTMLLabelElement> labelElement(do_QueryInterface(aLookNode));
+  if (labelElement) {
+    nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(aLookNode));
+    nsresult rv = NS_OK;
+
+    if (elt) {
+      nsAutoString labelIsFor;
+      elt->GetAttribute(NS_LITERAL_STRING("for"),labelIsFor);
+      if (labelIsFor.Equals(*aId))
+        rv = AppendFlatStringFromSubtree(aLookNode, aLabel);
+    }
+    return rv;
+  }
+
+  aLookNode->ChildCount(numChildren);
+  nsIContent *contentWalker;
+  PRInt32 index;
+  for (index = 0; index < numChildren; index++) {
+    aLookNode->ChildAt(index, contentWalker);
+    if (contentWalker)
+      AppendLabelFor(contentWalker, aId, aLabel);
+  }
+  return NS_OK;
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIContent> walkUpContent(do_QueryInterface(mDOMNode));
+  nsCOMPtr<nsIDOMHTMLLabelElement> labelElement;
+  nsCOMPtr<nsIDOMHTMLFormElement> formElement;
+  nsresult rv = NS_OK;
+
+  nsAutoString label;
+  // go up tree get name of ancestor label if there is one. Don't go up farther than form element
+  while (walkUpContent && label.IsEmpty() && !formElement) {
+    labelElement = do_QueryInterface(walkUpContent);
+    if (labelElement) 
+      rv = AppendFlatStringFromSubtree(walkUpContent, &label);
+    formElement = do_QueryInterface(walkUpContent); // reached top ancestor in form
+    nsCOMPtr<nsIContent> nextParent;
+    walkUpContent->GetParent(*getter_AddRefs(nextParent));
+    walkUpContent = nextParent;
+  }
+  
+
+  // There can be a label targeted at this control using the for="control_id" attribute
+  // To save computing time, only look for those inside of a form element
+  walkUpContent = do_QueryInterface(formElement);
+  
+  if (walkUpContent) {
+    nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
+    nsAutoString forId;
+    elt->GetAttribute(NS_LITERAL_STRING("id"), forId);
+    // Actually we'll be walking down the content this time, with a depth first search
+    if (!forId.IsEmpty())
+      AppendLabelFor(walkUpContent,&forId,&label); 
+  } 
+  
+  label.CompressWhitespace();
+  if (label.IsEmpty())
+    return nsAccessible::GetAccName(_retval);
+
+  _retval.Assign(label);
+  
+  return NS_OK;
+}
+
+/* long getAccState (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
+{
+  // can be
+  // focusable, focused, checked, protected, unavailable
+  nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+
+  nsAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
+
+  PRBool checked = PR_FALSE;
+  element->GetChecked(&checked);
+  if (checked) *_retval |= STATE_CHECKED;
+
+  PRBool disabled = PR_FALSE;
+  element->GetDisabled(&disabled);
+  if (disabled)
+    *_retval |= STATE_UNAVAILABLE;
+
+  nsAutoString typeString;
+  element->GetType(typeString);
+  if (typeString.EqualsIgnoreCase("password"))
+    *_retval |= STATE_PROTECTED;
+
+  return NS_OK;
+}
+
+// --- checkbox -----
+
+nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsHTMLFormControlAccessible(aNode, aShell)
+{ 
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_CHECKBUTTON;
+  return NS_OK;
+}
+
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == 0) {
+    // check or uncheck
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+
+    PRBool checked = PR_FALSE;
+    if (element) 
+      element->GetChecked(&checked);
+
+    if (checked)
+      _retval = NS_LITERAL_STRING("uncheck");
+    else
+      _retval = NS_LITERAL_STRING("check");
+
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == 0) {   // 0 is the magic value for default action
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    PRBool checked = PR_FALSE;
+    element->GetChecked(&checked);
+    element->SetChecked(checked ? PR_FALSE : PR_TRUE);
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+
+//------ Radio button -------
+
+nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsHTMLFormControlAccessible(aNode, aShell)
+{ 
+}
+
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == 0) {
+    _retval = NS_LITERAL_STRING("select");
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == 0) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    element->Click();
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_RADIOBUTTON;
+
+  return NS_OK;
+}
+
+// ----- Button -----
+
+nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsHTMLFormControlAccessible(aNode, aShell)
+{ 
+}
+
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;;
+}
+
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == 0) {
+    _retval = NS_LITERAL_STRING("press");
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLButtonAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == 0) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    element->Click();
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PUSHBUTTON;
+  return NS_OK;
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> button(do_QueryInterface(mDOMNode));
+
+  if (!button)
+    return NS_ERROR_FAILURE;
+
+  nsAutoString name;
+  button->GetValue(name);
+  name.CompressWhitespace();
+  _retval.Assign(name);
+
+  return NS_OK;
+}
+
+
+// ----- HTML 4 Button: can contain arbitrary HTML content -----
+
+nsHTML4ButtonAccessible::nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsHTMLBlockAccessible(aNode, aShell)
+{ 
+}
+
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;;
+}
+
+/* wstring getAccActionName (in PRUint8 index); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == 0) {
+    _retval = NS_LITERAL_STRING("press");
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == 0) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    element->Click();
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PUSHBUTTON;
+  return NS_OK;
+}
+
+/* long getAccState (); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccState(PRUint32 *_retval)
+{
+  nsAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
+  return NS_OK;
+}
+
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
+
+  nsAutoString name;
+  if (content)
+    rv = AppendFlatStringFromSubtree(content, &name);
+
+  if (NS_SUCCEEDED(rv)) {
+    // Temp var needed until CompressWhitespace built for nsAWritableString
+    name.CompressWhitespace();
+    _retval.Assign(name);
+  }
+
+  return rv;
+}
+
+
+// --- textfield -----
+
+nsHTMLTextFieldAccessible::nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsHTMLFormControlAccessible(aNode, aShell)
+{ 
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_TEXT;
+  return NS_OK;
+}
+
+/* wstring getAccValue (); */
+NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIDOMHTMLTextAreaElement> textArea(do_QueryInterface(mDOMNode));
+  if (textArea) {
+    textArea->GetValue(_retval);
+    return NS_OK;
+  }
+  
+  nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(mDOMNode));
+  if (inputElement) {
+    inputElement->GetValue(_retval);
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+/* long getAccState (); */
+NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval)
+{
+  // can be
+  // focusable, focused, protected. readonly, unavailable, selected
+
+  nsAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
+
+  nsCOMPtr<nsIDOMHTMLTextAreaElement> textArea(do_QueryInterface(mDOMNode));
+  nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(mDOMNode));
+
+  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
+  PRBool isReadOnly = PR_FALSE;
+  elt->HasAttribute(NS_LITERAL_STRING("readonly"), &isReadOnly);
+  if (isReadOnly)
+    *_retval |= STATE_READONLY;
+
+  // Get current selection and find out if current node is in it
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell) {
+     return NS_ERROR_FAILURE;  
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  shell->GetPresContext(getter_AddRefs(context));
+  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
+  nsIFrame *frame;
+  if (content && NS_SUCCEEDED(shell->GetPrimaryFrameFor(content, &frame))) {
+    nsCOMPtr<nsISelectionController> selCon;
+    frame->GetSelectionController(context,getter_AddRefs(selCon));
+    if (selCon) {
+      nsCOMPtr<nsISelection> domSel;
+      selCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(domSel));
+      if (domSel) {
+        PRBool isCollapsed = PR_TRUE;
+        domSel->GetIsCollapsed(&isCollapsed);
+        if (!isCollapsed)
+          *_retval |=STATE_SELECTED;
+      }
+    }
+  }
+
+
+  if (!textArea) {
+    if (inputElement) {
+      /////// ====== Must be a password field, so it uses nsIDOMHTMLFormControl ==== ///////
+      PRUint32 moreStates = 0;
+      nsresult rv = nsHTMLFormControlAccessible::GetAccState(&moreStates);
+      *_retval |= moreStates;
+      return rv;
+    }
+    return NS_ERROR_FAILURE;
+  }
+
+  PRBool disabled = PR_FALSE;
+  textArea->GetDisabled(&disabled);
+  if (disabled)
+    *_retval |= STATE_UNAVAILABLE;
+
+  return NS_OK;
+}
+

mozilla/accessible/src/nsHTMLFormControlAccessible.h

@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Eric D Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLFormControlAccessible_H_
+#define _nsHTMLFormControlAccessible_H_
+
+#include "nsAccessible.h"
+
+class nsICheckboxControlFrame;
+
+/* Accessible for supporting for controls
+ * supports:
+ * - walking up to get name from label
+ * - support basic state
+ */
+class nsHTMLFormControlAccessible : public nsLeafAccessible
+{
+
+public:
+  nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+
+protected:
+  NS_IMETHODIMP AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel);
+};
+
+class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+};
+
+class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+};
+
+class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+};
+
+class nsHTML4ButtonAccessible : public nsHTMLBlockAccessible
+{
+
+public:
+  nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+};
+
+
+class nsHTMLTextFieldAccessible : public nsHTMLFormControlAccessible
+{
+public:
+  nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+};
+
+#endif  

mozilla/accessible/src/nsHTMLIFrameRootAccessible.cpp

@@ -0,0 +1,274 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+#include "nsHTMLIFrameRootAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIDocShell.h"
+#include "nsIWebShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIXULDocument.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMDocumentType.h"
+#include "nsINameSpaceManager.h"
+#include "nsReadableUtils.h"
+
+NS_INTERFACE_MAP_BEGIN(nsHTMLIFrameRootAccessible)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMFormListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener)
+NS_INTERFACE_MAP_END_INHERITING(nsRootAccessible)
+
+NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
+NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
+
+NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
+NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
+
+
+NS_IMETHODIMP
+nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+  NS_ASSERTION(aInstancePtr, "QueryInterface requires a non-NULL destination!");
+  if ( !aInstancePtr )
+    return NS_ERROR_NULL_POINTER;
+  if (aIID.Equals(NS_GET_IID(nsIAccessibleDocument))) {
+    *aInstancePtr = (void*)(nsIAccessibleDocument*) this;
+    NS_IF_ADDREF(this);
+    return NS_OK;
+  }
+  return nsHTMLBlockAccessible::QueryInterface(aIID, aInstancePtr); 
+}
+
+
+nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *aDoc):
+  nsHTMLBlockAccessible(aNode, aShell), mRootAccessible(aRoot), nsDocAccessibleMixin(aDoc)
+{
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAWritableString& aAccName) 
+{ 
+  return GetTitle(aAccName);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAWritableString& aAccValue) 
+{ 
+  return GetURL(aAccValue);
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  return mRootAccessible->GetAccFirstChild(_retval);
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  return mRootAccessible->GetAccLastChild(_retval);
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  return mRootAccessible->GetAccChildCount(_retval);
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PANE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccState(PRUint32 *aAccState)
+{
+  return nsDocAccessibleMixin::GetAccState(aAccState);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAWritableString& aURL)
+{
+  return nsDocAccessibleMixin::GetURL(aURL);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAWritableString& aTitle)
+{
+  return nsDocAccessibleMixin::GetTitle(aTitle);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAWritableString& aMimeType)
+{
+  return nsDocAccessibleMixin::GetMimeType(aMimeType);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAWritableString& aDocType)
+{
+  return nsDocAccessibleMixin::GetDocType(aDocType);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
+{
+  return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI);
+}
+
+NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocument(nsIDocument **doc)
+{
+  return nsDocAccessibleMixin::GetDocument(doc);
+}
+
+//=============================//
+// nsHTMLIFrameRootAccessible  //
+//=============================//
+
+
+//-----------------------------------------------------
+// construction 
+//-----------------------------------------------------
+nsHTMLIFrameRootAccessible::nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+  nsRootAccessible(aShell)
+{
+  mRealDOMNode = aNode;
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsHTMLIFrameRootAccessible::~nsHTMLIFrameRootAccessible()
+{
+}
+
+  /* readonly attribute nsIAccessible accParent; */
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccParent(nsIAccessible * *_retval) 
+{ 
+  nsCOMPtr<nsIAccessible> accessible;
+  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
+    return accessible->GetAccParent(_retval);
+
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+  /* nsIAccessible getAccNextSibling (); */
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccNextSibling(nsIAccessible **_retval) 
+{
+  nsCOMPtr<nsIAccessible> accessible;
+
+  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
+    return accessible->GetAccNextSibling(_retval);
+
+  *_retval = nsnull;
+  return NS_ERROR_FAILURE;
+}
+
+  /* nsIAccessible getAccPreviousSibling (); */
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccPreviousSibling(nsIAccessible **_retval) 
+{
+  nsCOMPtr<nsIAccessible> accessible;
+
+  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
+    return accessible->GetAccPreviousSibling(_retval);
+
+  *_retval = nsnull;
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetHTMLIFrameAccessible(nsIAccessible** aAcc)
+{
+  // Start by finding our PresShell and from that
+  // we get our nsIDocShell in order to walk the DocShell tree
+  nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mPresShell));
+  if (!presShell) {
+     *aAcc = nsnull;
+     return NS_ERROR_FAILURE;  
+  }
+
+  nsCOMPtr<nsIDocShell> docShell;
+  if (NS_SUCCEEDED(GetDocShellFromPS(presShell, getter_AddRefs(docShell)))) {
+    // Now that we have the DocShell QI 
+    // it to a tree item to find it's parent
+    nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(docShell));
+    if (item) {
+      nsCOMPtr<nsIDocShellTreeItem> itemParent;
+      item->GetParent(getter_AddRefs(itemParent));
+      // QI to get the WebShell for the parent document
+      nsCOMPtr<nsIDocShell> parentDocShell(do_QueryInterface(itemParent));
+      if (parentDocShell) {
+        // Get the PresShell/Content and 
+        // Root Content Node of the parent document
+        nsCOMPtr<nsIPresShell> parentPresShell;
+        nsCOMPtr<nsIPresContext> parentPresContext;
+        nsCOMPtr<nsIContent> rootContent;
+        if (NS_SUCCEEDED(GetDocShellObjects(parentDocShell,
+                                            getter_AddRefs(parentPresShell), 
+                                            getter_AddRefs(parentPresContext),
+                                            getter_AddRefs(rootContent)))) {
+          // QI the DocShell (of this sub-doc) to a webshell
+          nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(docShell));
+          if (webShell && parentPresShell && parentPresContext && rootContent) {
+            // Now, find the Content in the parent document
+            // that represents this sub-doc, 
+            // we do that matching webshells
+            nsCOMPtr<nsIContent> content;
+            if (FindContentForWebShell(parentPresShell, 
+                                       rootContent, 
+                                       webShell,
+                                       getter_AddRefs(content))) {
+              // OK, we found the content node in the parent doc
+              // that corresponds to this sub-doc
+              // Get the frame for that content
+              nsCOMPtr<nsIWeakReference> wr = do_GetWeakReference(parentPresShell);
+              nsIFrame* frame = nsnull;
+              parentPresShell->GetPrimaryFrameFor(content, &frame);
+#ifdef NS_DEBUG_X
+              printf("** Found: Con:%p  Fr:%p", content, frame);
+              char * name;
+              if (GetNameForFrame(frame, &name)) {
+                printf(" Name:[%s]", name);
+                nsMemory::Free(name);
+              }
+              printf("\n");
+#endif
+
+
+              nsCOMPtr<nsIDOMNode> node(do_QueryInterface(content));
+              nsCOMPtr<nsIAccessible> acc(do_QueryInterface(frame));
+
+              *aAcc = acc;
+              NS_IF_ADDREF(*aAcc);
+
+              return NS_OK;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+

mozilla/accessible/src/nsHTMLIFrameRootAccessible.h

@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+#ifndef _nsIFrameRootAccessible_H_
+#define _nsIFrameRootAccessible_H_
+
+#include "nsRootAccessible.h"
+#include "nsAccessible.h"
+#include "nsIAccessibleDocument.h"
+
+class nsIWebShell;
+class nsIWeakReference;
+
+class nsHTMLIFrameAccessible : public nsHTMLBlockAccessible, 
+                               public nsIAccessibleDocument,
+                               public nsDocAccessibleMixin
+{
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIACCESSIBLEDOCUMENT
+
+  public:
+    nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *doc);
+
+    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
+    NS_IMETHOD GetAccValue(nsAWritableString& AccValue);
+    NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
+    NS_IMETHOD GetAccState(PRUint32 *aAccState);
+
+  protected:
+    nsCOMPtr<nsIAccessible> mRootAccessible;
+};
+
+class nsHTMLIFrameRootAccessible : public nsRootAccessible
+{
+  NS_DECL_ISUPPORTS_INHERITED
+
+  public:
+    nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+    virtual ~nsHTMLIFrameRootAccessible();
+
+    /* attribute wstring accName; */
+    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
+
+    /* nsIAccessible getAccNextSibling (); */
+    NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+
+    /* nsIAccessible getAccPreviousSibling (); */
+    NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+
+  protected:
+    NS_IMETHOD GetHTMLIFrameAccessible(nsIAccessible** aAcc);
+    nsCOMPtr<nsIDOMNode> mRealDOMNode;
+};
+
+
+#endif  

mozilla/accessible/src/nsHTMLImageAccessible.cpp

@@ -0,0 +1,188 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsGenericAccessible.h"
+#include "nsHTMLImageAccessible.h"
+#include "nsReadableUtils.h"
+#include "nsAccessible.h"
+#include "nsIHTMLDocument.h"
+#include "nsIDocument.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsIAccessibilityService.h"
+#include "nsIServiceManager.h"
+#include "imgIRequest.h"
+#include "imgIContainer.h"
+#include "nsIImageFrame.h"
+
+// --- image -----
+
+nsHTMLImageAccessible::nsHTMLImageAccessible(nsIDOMNode* aDOMNode, nsIImageFrame *aImageFrame, nsIWeakReference* aShell):
+nsLinkableAccessible(aDOMNode, aShell)
+{ 
+  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(aDOMNode));
+  nsCOMPtr<nsIDocument> doc;
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
+
+  shell->GetDocument(getter_AddRefs(doc));
+  nsAutoString mapElementName;
+
+  if (doc && element) {
+    nsCOMPtr<nsIHTMLDocument> htmlDoc(do_QueryInterface(doc));
+    element->GetAttribute(NS_LITERAL_STRING("usemap"),mapElementName);
+    if (htmlDoc && !mapElementName.IsEmpty()) {
+      if (mapElementName.CharAt(0) == '#')
+        mapElementName.Cut(0,1);
+      htmlDoc->GetImageMap(mapElementName, getter_AddRefs(mMapElement));      
+    }
+  }
+}
+
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval)
+{
+  // The state is a bitfield, get our inherited state, then logically OR it with STATE_ANIMATED if this
+  // is an animated image.
+
+  nsLinkableAccessible::GetAccState(_retval);
+
+  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  nsIFrame *frame = nsnull;
+  if (content && shell) 
+    shell->GetPrimaryFrameFor(content, &frame);
+
+  nsCOMPtr<nsIImageFrame> imageFrame(do_QueryInterface(frame));
+
+  nsCOMPtr<imgIRequest> imageRequest;
+  if (imageFrame) 
+    imageFrame->GetImageRequest(getter_AddRefs(imageRequest));
+  
+  nsCOMPtr<imgIContainer> imgContainer;
+  if (imageRequest) 
+    imageRequest->GetImage(getter_AddRefs(imgContainer));
+
+  if (imgContainer) {
+    PRUint32 numFrames;
+    imgContainer->GetNumFrames(&numFrames);
+    if (numFrames > 1)
+      *_retval |= STATE_ANIMATED;
+  }
+
+  return NS_OK;
+}
+
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIContent> imageContent(do_QueryInterface(mDOMNode));
+  if (imageContent) {
+    nsAutoString name;
+    rv = AppendFlatStringFromContentNode(imageContent, &name);
+    if (NS_SUCCEEDED(rv)) {
+      // Temp var needed until CompressWhitespace built for nsAWritableString
+      name.CompressWhitespace();
+      _retval.Assign(name);
+    }
+  }
+  return rv;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_GRAPHIC;
+  return NS_OK;
+}
+
+
+nsIAccessible *nsHTMLImageAccessible::CreateAreaAccessible(PRUint32 areaNum)
+{
+  if (!mMapElement) 
+    return nsnull;
+
+   if (areaNum == -1) {
+    PRInt32 numAreaMaps;
+    GetAccChildCount(&numAreaMaps);
+    if (numAreaMaps<=0)
+      return nsnull;
+    areaNum = NS_STATIC_CAST(PRUint32,numAreaMaps-1);
+  }
+
+  nsIDOMHTMLCollection *mapAreas;
+  mMapElement->GetAreas(&mapAreas);
+  if (!mapAreas) 
+    return nsnull;
+
+  nsIDOMNode *domNode = nsnull;
+  mapAreas->Item(areaNum,&domNode);
+  if (!domNode)
+    return nsnull;
+
+  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
+  if (!accService)
+    return nsnull;
+  if (accService) {
+    nsIAccessible* acc = nsnull;
+    accService->CreateHTMLAreaAccessible(mPresShell, domNode, this, &acc);
+    return acc;
+  }
+  return nsnull;
+}
+
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = CreateAreaAccessible(0);
+  return NS_OK;
+}
+
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = CreateAreaAccessible(-1);
+  return NS_OK;
+}
+
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsHTMLImageAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  if (mMapElement) {
+    nsIDOMHTMLCollection *mapAreas;
+    mMapElement->GetAreas(&mapAreas);
+    if (mapAreas) {
+      PRUint32 length;
+      mapAreas->GetLength(&length);
+      *_retval = NS_STATIC_CAST(PRInt32, length);
+    }
+  }
+
+  return NS_OK;
+}
+

mozilla/accessible/src/nsHTMLImageAccessible.h

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLImageAccessible_H_
+#define _nsHTMLImageAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsIFrame.h"
+#include "nsIImageFrame.h"
+#include "nsIDOMHTMLMapElement.h"
+
+/* Accessible for supporting images
+ * supports:
+ * - gets name, role
+ * - support basic state
+ */
+class nsHTMLImageAccessible : public nsLinkableAccessible
+{
+
+public:
+  nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIImageFrame *imageFrame, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+
+protected:
+  nsIAccessible *CreateAreaAccessible(PRUint32 areaNum);
+  nsCOMPtr<nsIDOMHTMLMapElement> mMapElement;
+};
+
+#endif  

mozilla/accessible/src/nsHTMLLinkAccessible.cpp

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLLinkAccessible.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+#include "nsILink.h"
+#include "nsILinkHandler.h"
+#include "nsISelection.h"
+#include "nsISelectionController.h"
+#include "nsIPresContext.h"
+#include "nsReadableUtils.h"
+#include "nsIDOMElement.h"
+
+nsHTMLLinkAccessible::nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsLinkableAccessible(aDomNode, aShell)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAWritableString& _retval)
+{ 
+  if (!IsALink())  // Also initializes private data members
+    return NS_ERROR_FAILURE;
+
+  nsAutoString name;
+  nsresult rv = AppendFlatStringFromSubtree(mLinkContent, &name);
+  if (NS_SUCCEEDED(rv)) {
+    // Temp var needed until CompressWhitespace built for nsAWritableString
+    name.CompressWhitespace();
+    _retval.Assign(name);
+  }
+  return rv;
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLLinkAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_LINK;
+
+  return NS_OK;
+}
+

mozilla/accessible/src/nsHTMLLinkAccessible.h

@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ */
+
+#ifndef _nsHTMLLinkAccessible_H_
+#define _nsHTMLLinkAccessible_H_
+
+#include "nsAccessible.h"
+
+class nsHTMLLinkAccessible : public nsLinkableAccessible
+{
+
+public:
+  nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+};
+
+#endif  

mozilla/accessible/src/nsHTMLListboxAccessible.cpp

@@ -0,0 +1,183 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsHTMLListboxAccessible.h"
+
+#include "nsCOMPtr.h"
+#include "nsIAccessibilityService.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIDOMHTMLOptionElement.h"
+#include "nsIFrame.h"
+#include "nsIServiceManager.h"
+#include "nsLayoutAtoms.h"
+
+/** ----- nsHTMLListboxAccessible ----- */
+
+/**
+  * Constructor -- create the nsHTMLAccessible
+  */
+nsHTMLListboxAccessible::nsHTMLListboxAccessible(nsIDOMNode* aDOMNode, 
+                                                   nsIWeakReference* aShell)
+                        :nsAccessible(aDOMNode, aShell)
+{
+}
+
+/** Inherit the ISupports impl from nsAccessible */
+NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLListboxAccessible, nsAccessible, nsIAccessibleSelectable)
+
+/** 
+  * Tell our caller we are a list ( there isn't a listbox value )
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_WINDOW;
+  return NS_OK;
+}
+
+/** 
+  * Through the arg, pass back our last child, a nsHTMLListboxWindowAccessible object
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/** 
+  * Through the arg, pass back our first child, a nsHTMLListboxWindowAccessible object
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  * We always have 1 child: SelectList.
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/**
+  * nsIAccessibleSelectable method. This needs to get from the select the list
+  *     of select options and then iterate through that pulling out the selected
+  *     items and creating IAccessible objects for them. Put the IAccessibles in
+  *     the nsISupportsArray and return them.
+  * retval will be nsnull if:
+  *    - there are no options in the select
+  *    - there are options but none are selected
+  *    - the DOMNode is not a nsIDOMHTMLSelectElement ( shouldn't happen )
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetSelectedChildren(nsISupportsArray **_retval)
+{
+  nsCOMPtr<nsIDOMHTMLSelectElement> select(do_QueryInterface(mDOMNode));
+  if(select) {
+    nsCOMPtr<nsIDOMHTMLCollection> options;
+    // get all the options in the select
+    select->GetOptions(getter_AddRefs(options));
+    if (options) {
+      // set up variables we need to get the selected options and to get their nsIAccessile objects
+      PRUint32 length;
+      options->GetLength(&length);
+      nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
+      nsCOMPtr<nsISupportsArray> selectedAccessibles;
+      NS_NewISupportsArray(getter_AddRefs(selectedAccessibles));
+      if (!selectedAccessibles || !accService)
+        return NS_ERROR_FAILURE;
+      // find the selected options and get the accessible objects;
+      PRBool isSelected = PR_FALSE;
+      nsCOMPtr<nsIPresContext> context;
+      GetPresContext(context);
+      for (PRUint32 i = 0 ; i < length ; i++) {
+        nsCOMPtr<nsIDOMNode> tempNode;
+        options->Item(i,getter_AddRefs(tempNode));
+        if (tempNode) {
+          nsCOMPtr<nsIDOMHTMLOptionElement> tempOption(do_QueryInterface(tempNode));
+          if (tempOption)
+            tempOption->GetSelected(&isSelected);
+          if (isSelected) {
+            nsCOMPtr<nsIAccessible> tempAccess;
+            accService->CreateHTMLSelectOptionAccessible(tempOption, this, context, getter_AddRefs(tempAccess));
+            if ( tempAccess )
+              selectedAccessibles->AppendElement(tempAccess);
+            isSelected = PR_FALSE;
+          }
+        }
+      }
+      selectedAccessibles->Count(&length); // reusing length
+      if ( length != 0 ) { // length of nsISupportsArray containing selected options
+        *_retval = selectedAccessibles;
+        NS_IF_ADDREF(*_retval);
+        return NS_OK;
+      }
+    }
+  }
+  // no options, not a select or none of the options are selected
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  * Our value is the value of our ( first ) selected child. SelectElement
+  *     returns this by default with GetValue().
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIDOMHTMLSelectElement> select (do_QueryInterface(mDOMNode));
+  if ( select ) {
+    select->GetValue(_retval);  
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+/**
+  * As a nsHTMLListboxAccessible we can have the following states:
+  *     STATE_FOCUSED
+  *     STATE_READONLY
+  *     STATE_FOCUSABLE
+  */
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccState(PRUint32 *_retval)
+{
+  // this sets either STATE_FOCUSED or 0
+  nsAccessible::GetAccState(_retval);
+
+  *_retval |= STATE_READONLY | STATE_FOCUSABLE;
+
+  return NS_OK;
+}
+
+
+

mozilla/accessible/src/nsHTMLListboxAccessible.h

@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: John Gaunt (jgaunt@netscape.com)
+ *
+ * Contributor(s):
+ */
+#ifndef __nsHTMLListboxAccessible_h__
+#define __nsHTMLListboxAccessible_h__
+
+#include "nsAccessible.h"
+#include "nsIAccessibleSelectable.h"
+
+#include "nsCOMPtr.h"
+#include "nsHTMLSelectListAccessible.h"
+
+/*
+ * A class the represents the HTML Combobox widget.
+ */
+class nsHTMLListboxAccessible : public nsAccessible,
+                                public nsIAccessibleSelectable  
+{
+public:
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIACCESSIBLESELECTABLE
+  
+  nsHTMLListboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLListboxAccessible() {}
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+};
+
+#endif

mozilla/accessible/src/nsHTMLSelectAccessible.cpp

@@ -0,0 +1,794 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsHTMLSelectAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsRootAccessible.h"
+#include "nsINameSpaceManager.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsLayoutAtoms.h"
+#include "nsIDOMXULListener.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsReadableUtils.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsISelectElement.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIAccessibilityService.h"
+#include "nsIServiceManager.h"
+#include "nsIDOMHTMLOptionElement.h"
+
+/*
+ * A class the represents the text field in the Select to the left
+ * of the drop down button
+ */
+class nsHTMLSelectTextFieldAccessible  : public nsLeafAccessible
+{
+public:
+  
+  nsHTMLSelectTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+
+  virtual void GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame);
+
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+/*
+ * A base class that can listen to menu events. Its used so the 
+ * button and the window accessibles can change there name and role
+ * depending on whether the drop down list is dropped down on not
+ */
+class nsMenuListenerAccessible  : public nsAccessible, public nsIDOMXULListener
+{
+public:
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  nsMenuListenerAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsMenuListenerAccessible();
+
+  // popup listener
+  NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent);
+  NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent);
+  NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }
+  
+  NS_IMETHOD Close(nsIDOMEvent* aEvent);
+  NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+  virtual void SetupMenuListener();
+
+  PRBool mRegistered;
+  PRBool mOpen;
+};
+
+NS_IMPL_ISUPPORTS_INHERITED(nsMenuListenerAccessible, nsAccessible, nsIDOMXULListener)
+
+/**
+ * A class that represents the button inside the Select to the right of the text field
+ */
+class nsHTMLSelectButtonAccessible  : public nsMenuListenerAccessible
+{
+public:
+  
+  nsHTMLSelectButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+
+
+  virtual void GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame);
+
+
+
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+/*
+ * A class that represents the window that lives to the right
+ * of the drop down button inside the Select. This is the window
+ * that is made visible when the button is pressed.
+ */
+class nsHTMLSelectWindowAccessible : public nsMenuListenerAccessible
+{
+public:
+
+  nsHTMLSelectWindowAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+  virtual void GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame);
+   
+  nsCOMPtr<nsIAccessible> mParent; 
+};
+
+/*
+ * The list that contains all the options in the select. It is inside the window.
+ */
+class nsHTMLSelectListAccessible : public nsAccessible
+{
+public:
+  
+  nsHTMLSelectListAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLSelectListAccessible() {}
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+//--------- nsHTMLSelectAccessible -----
+ 
+nsHTMLSelectAccessible::nsHTMLSelectAccessible(nsIDOMNode* aDOMNode, 
+                                       nsIWeakReference* aShell)
+                                               :nsAccessible(aDOMNode, aShell)
+{
+}
+
+NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLSelectAccessible, nsAccessible, nsIAccessibleSelectable)
+
+// ------------- Helper method for determination of proper Frame ------
+//static 
+PRBool nsHTMLSelectAccessible::IsCorrectFrame( nsIFrame* aFrame, nsIAtom* aAtom ) {
+  if (!aFrame || !aAtom)
+    return PR_FALSE;
+  nsCOMPtr<nsIAtom> frameType;
+  aFrame->GetFrameType(getter_AddRefs(frameType));
+  if (frameType.get() != aAtom)
+    return PR_FALSE;
+  return PR_TRUE;
+}
+
+NS_IMETHODIMP nsHTMLSelectAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIAccessible> text;
+  GetAccFirstChild(getter_AddRefs(text));
+  if (text)
+    return text->GetAccValue(_retval);
+
+  return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsHTMLSelectAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_COMBOBOX;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  // create a window accessible
+  *_retval = new nsHTMLSelectWindowAccessible(this, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  // create a text field
+
+  *_retval = new nsHTMLSelectTextFieldAccessible(this, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  // always have 3 children
+  *_retval = 3;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectAccessible::GetSelectedChildren(nsISupportsArray **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+//-------- SelectTextFieldAccessible ------
+
+nsHTMLSelectTextFieldAccessible::nsHTMLSelectTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsLeafAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+NS_IMETHODIMP nsHTMLSelectTextFieldAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+  if ( !frame )
+    return NS_ERROR_FAILURE;
+
+  frame->FirstChild(context, nsnull, &frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::blockFrame) )
+    return NS_ERROR_FAILURE;
+
+  frame->FirstChild(context, nsnull, &frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::textFrame) )
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIContent> content;
+  frame->GetContent(getter_AddRefs(content));
+
+  if (!content) 
+    return NS_ERROR_FAILURE;
+
+  AppendFlatStringFromSubtree(content, &_retval);
+
+  return NS_OK;
+}
+
+void nsHTMLSelectTextFieldAccessible::GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame)
+{
+  // get our first child's frame
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+  if ( !frame )
+    return;
+
+  frame->FirstChild(context, nsnull, &frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::blockFrame) )
+    return;
+
+  frame->GetParent(aRelativeFrame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( *aRelativeFrame, nsLayoutAtoms::areaFrame) )
+    return;
+
+  frame->GetRect(aBounds);
+}
+
+NS_IMETHODIMP nsHTMLSelectTextFieldAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectTextFieldAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLSelectButtonAccessible(parent, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectTextFieldAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectTextFieldAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_STATICTEXT;
+  return NS_OK;
+}
+
+// --------- nsMenuListenerAccessible -----------
+
+nsMenuListenerAccessible::nsMenuListenerAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsAccessible(aDOMNode, aShell)
+{
+  mRegistered = PR_FALSE;
+  mOpen = PR_FALSE;
+}
+
+nsMenuListenerAccessible::~nsMenuListenerAccessible()
+{
+  if (mRegistered) {
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
+     if (eventReceiver) 
+       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE);   
+  }
+}
+
+NS_IMETHODIMP nsMenuListenerAccessible::PopupShowing(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_TRUE;
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsMenuListenerAccessible::PopupHiding(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsMenuListenerAccessible::Close(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+void
+nsMenuListenerAccessible::SetupMenuListener()
+{
+  // not not already one register ourselves as a popup listener
+  if (!mRegistered) {
+
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(mDOMNode));
+     if (!eventReceiver) {
+       return;
+     }
+
+     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE);   
+
+     if (NS_FAILED(rv)) {
+       return;
+     }
+
+     mRegistered = PR_TRUE;
+  }
+
+}
+
+
+//-------- SelectButtonAccessible ------
+
+nsHTMLSelectButtonAccessible::nsHTMLSelectButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsMenuListenerAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+/* void accDoAction (in PRUint8 index); */
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::AccDoAction(PRUint8 index)
+{
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  frame->FirstChild(context, nsnull, &frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::blockFrame) )
+    return NS_ERROR_FAILURE;
+ 
+  frame->GetNextSibling(&frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::gfxButtonControlFrame) )
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIContent> content;
+  frame->GetContent(getter_AddRefs(content));
+
+  if (index == 0) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(content));
+    if (element)
+    {
+       element->Click();
+       return NS_OK;
+    }
+    return NS_ERROR_FAILURE;
+  }
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* PRUint8 getAccNumActions (); */
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+void nsHTMLSelectButtonAccessible::GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame)
+{
+  // get our second child's frame
+  nsIFrame* frame = nsAccessible::GetBoundsFrame();
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  frame->FirstChild(context, nsnull, &frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::blockFrame) )
+    return;
+
+  frame->GetNextSibling(&frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::gfxButtonControlFrame) )
+    return;
+
+  frame->GetParent(aRelativeFrame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( *aRelativeFrame, nsLayoutAtoms::areaFrame) )
+    return;
+
+  frame->GetRect(aBounds);
+}
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PUSHBUTTON;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccName(nsAWritableString& _retval)
+{
+  return GetAccActionName(0, _retval);
+}
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+   SetupMenuListener();
+
+   // get the current state open or closed
+   // set _retval to it.
+   // notice its supposed to be reversed. Close if opened
+   // and Open if closed.
+
+   if (mOpen)
+       _retval = NS_LITERAL_STRING("Close");
+   else
+       _retval = NS_LITERAL_STRING("Open");
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLSelectWindowAccessible(parent, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLSelectTextFieldAccessible(parent, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectButtonAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}
+
+//---------------------
+
+
+nsHTMLSelectWindowAccessible::nsHTMLSelectWindowAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell)
+:nsMenuListenerAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccState(PRUint32 *_retval)
+{
+   nsAccessible::GetAccState(_retval);
+
+   SetupMenuListener();
+
+  // if open we are visible if closed we are invisible
+   // set _retval to it.
+   if (mOpen)
+     *_retval |= STATE_DEFAULT;
+   else
+     *_retval |= STATE_INVISIBLE;
+
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_WINDOW;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+ 
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> parent;
+  GetAccParent(getter_AddRefs(parent));
+
+  *_retval = new nsHTMLSelectButtonAccessible(parent, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+void nsHTMLSelectWindowAccessible::GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame)
+{
+    // get our first option
+  nsCOMPtr<nsIDOMNode> child;
+  mDOMNode->GetFirstChild(getter_AddRefs(child));
+
+  // now get its frame
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell) {
+    *aRelativeFrame = nsnull;
+    return;
+  }
+
+  nsIFrame* frame = nsnull;
+  nsCOMPtr<nsIContent> content(do_QueryInterface(child));
+  shell->GetPrimaryFrameFor(content, &frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::blockFrame) )
+    return;
+
+  frame->GetParent(&frame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( frame, nsLayoutAtoms::areaFrame) )
+    return;
+
+  frame->GetParent(aRelativeFrame);
+  if ( ! nsHTMLSelectAccessible::IsCorrectFrame( *aRelativeFrame, nsLayoutAtoms::listControlFrame) )
+    return;
+
+  frame->GetRect(aBounds);
+}
+
+//----------
+
+
+nsHTMLSelectListAccessible::nsHTMLSelectListAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell)
+:nsAccessible(aDOMNode, aShell)
+{
+    mParent = aParent;
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  return mParent->AccGetBounds(x,y,width,height);
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_ADDREF(*_retval);
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_LIST;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIDOMNode> last;
+  mDOMNode->GetLastChild(getter_AddRefs(last));
+
+  *_retval = new nsHTMLSelectOptionAccessible(this, last, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIDOMNode> first;
+  mDOMNode->GetFirstChild(getter_AddRefs(first));
+
+  *_retval = new nsHTMLSelectOptionAccessible(this, first, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+//--------
+
+nsHTMLSelectOptionAccessible::nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsLeafAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_LISTITEM;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+
+  nsCOMPtr<nsIDOMNode> next;
+  mDOMNode->GetNextSibling(getter_AddRefs(next));
+
+  if (next) {
+    *_retval = new nsHTMLSelectOptionAccessible(mParent, next, mPresShell);
+    if ( ! *_retval )
+      return NS_ERROR_FAILURE;
+    NS_ADDREF(*_retval);
+  }
+
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+
+  nsCOMPtr<nsIDOMNode> prev;
+  mDOMNode->GetPreviousSibling(getter_AddRefs(prev));
+
+  if (prev) {
+    *_retval = new nsHTMLSelectOptionAccessible(mParent, prev, mPresShell);
+    if ( ! *_retval )
+      return NS_ERROR_FAILURE;
+    NS_ADDREF(*_retval);
+  }
+
+  return NS_OK;
+} 
+
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIContent> content (do_QueryInterface(mDOMNode));
+  if (!content) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsAutoString option;
+  nsresult rv = AppendFlatStringFromSubtree(content, &option);
+  if (NS_SUCCEEDED(rv)) {
+    // Temp var needed until CompressWhitespace built for nsAWritableString
+    option.CompressWhitespace();
+    _retval.Assign(option);
+  }
+  return rv;
+}
+

mozilla/accessible/src/nsHTMLSelectAccessible.h

@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#ifndef __nsHTMLSelectAccessible_h__
+#define __nsHTMLSelectAccessible_h__
+
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIAtom.h"
+#include "nsIAccessibleSelectable.h"
+
+class nsHTMLSelectAccessible : public nsAccessible,
+                               public nsIAccessibleSelectable  
+{
+public:
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIACCESSIBLESELECTABLE
+  
+  nsHTMLSelectAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLSelectAccessible() {}
+
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+
+// helper method to verify frames
+  static PRBool IsCorrectFrame( nsIFrame* aFrame, nsIAtom* aAtom );
+
+};
+
+/*
+ * Each option in the Select. These are in the nsListAccessible
+ */
+class nsHTMLSelectOptionAccessible : public nsLeafAccessible
+{
+public:
+  
+  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
+
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+#endif

mozilla/accessible/src/nsHTMLSelectListAccessible.cpp

@@ -0,0 +1,312 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ *
+ * Contributor(s):  John Gaunt (jgaunt@netscape.com)
+ */
+
+#include "nsHTMLSelectListAccessible.h"
+
+#include "nsRootAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsLayoutAtoms.h"
+#include "nsIAtom.h"
+#include "nsIFrame.h"
+#include "nsISelectControlFrame.h"
+#include "nsIDOMHTMLOptionElement.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsIListControlFrame.h"
+
+/** ----- nsHTMLSelectListAccessible ----- */
+
+/**
+  *
+  */
+nsHTMLSelectListAccessible::nsHTMLSelectListAccessible(nsIAccessible* aParent, 
+                                                       nsIDOMNode* aDOMNode, 
+                                                       nsIWeakReference* aShell)
+                           :nsAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  return mParent->AccGetBounds(x,y,width,height);
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+  *_retval = mParent;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_LIST;
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIDOMNode> last;
+  mDOMNode->GetLastChild(getter_AddRefs(last));
+
+  *_retval = new nsHTMLSelectOptionAccessible(this, last, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIDOMNode> first;
+  mDOMNode->GetFirstChild(getter_AddRefs(first));
+
+  *_retval = new nsHTMLSelectOptionAccessible(this, first, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  * As a nsHTMLSelectListAccessible we can have the following states:
+  *     STATE_MULTISELECTABLE
+  *     STATE_EXTSELECTABLE
+  *     no STATE_FOCUSED!  -- can't be focused, options are focused instead
+  *     no STATE_FOCUSABLE!  -- can't be focused, options are focused instead
+  */
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccState(PRUint32 *_retval)
+{
+  nsCOMPtr<nsIDOMHTMLSelectElement> select (do_QueryInterface(mDOMNode));
+  if ( select ) {
+    PRBool multiple;
+    select->GetMultiple(&multiple);
+    if ( multiple )
+      *_retval |= STATE_MULTISELECTABLE | STATE_EXTSELECTABLE;
+  }
+
+  return NS_OK;
+}
+
+
+/** ----- nsHTMLSelectOptionAccessible ----- */
+
+/**
+  *
+  */
+nsHTMLSelectOptionAccessible::nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsLeafAccessible(aDOMNode, aShell)
+{
+  mParent = aParent;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_LISTITEM;
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+  *_retval = mParent;
+  NS_IF_ADDREF(*_retval);
+  return NS_OK;
+}
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+
+  nsCOMPtr<nsIDOMNode> next;
+  mDOMNode->GetNextSibling(getter_AddRefs(next));
+
+  if (next) {
+    *_retval = new nsHTMLSelectOptionAccessible(mParent, next, mPresShell);
+    if ( ! *_retval )
+      return NS_ERROR_FAILURE;
+    NS_ADDREF(*_retval);
+  }
+
+  return NS_OK;
+} 
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+
+  nsCOMPtr<nsIDOMNode> prev;
+  mDOMNode->GetPreviousSibling(getter_AddRefs(prev));
+
+  if (prev) {
+    *_retval = new nsHTMLSelectOptionAccessible(mParent, prev, mPresShell);
+    if ( ! *_retval )
+      return NS_ERROR_FAILURE;
+    NS_ADDREF(*_retval);
+  }
+
+  return NS_OK;
+} 
+
+/**
+  *
+  */
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccName(nsAWritableString& _retval)
+{
+  nsCOMPtr<nsIContent> content (do_QueryInterface(mDOMNode));
+  if (!content) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsAutoString option;
+  nsresult rv = AppendFlatStringFromSubtree(content, &option);
+  if (NS_SUCCEEDED(rv)) {
+    // Temp var needed until CompressWhitespace built for nsAWritableString
+    option.CompressWhitespace();
+    _retval.Assign(option);
+  }
+  return rv;
+}
+
+/**
+  * As a nsHTMLSelectOptionAccessible we can have the following states:
+  *     STATE_SELECTABLE
+  *     STATE_SELECTED
+  *     STATE_FOCUSED
+  *     STATE_FOCUSABLE
+  *     STATE_INVISIBLE // not implemented yet
+  */
+NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccState(PRUint32 *_retval)
+{
+  // this sets either STATE_FOCUSED or 0 (nsAccessible::GetAccState() doesn't know about list options)
+  *_retval = 0;
+  nsCOMPtr<nsIDOMNode> focusedOptionNode, parentNode;
+  mParent->AccGetDOMNode(getter_AddRefs(parentNode));
+  GetFocusedOptionNode(mPresShell, parentNode, focusedOptionNode);
+  if (focusedOptionNode == mDOMNode)
+    *_retval |= STATE_FOCUSED;
+
+  // Are we selected?
+  nsCOMPtr<nsIDOMHTMLOptionElement> option (do_QueryInterface(mDOMNode));
+  if ( option ) {
+    PRBool isSelected = PR_FALSE;
+    option->GetSelected(&isSelected);
+    if ( isSelected ) 
+      *_retval |= STATE_SELECTED;
+  }
+
+  *_retval |= STATE_SELECTABLE | STATE_FOCUSABLE;
+  
+  return NS_OK;
+}
+
+nsresult nsHTMLSelectOptionAccessible::GetFocusedOptionNode(nsIWeakReference *aPresShell, 
+                                                            nsIDOMNode *aListNode, 
+                                                            nsCOMPtr<nsIDOMNode>& aFocusedOptionNode)
+{
+  NS_ASSERTION(aListNode, "Called GetFocusedOptionNode without a valid list node");
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(aPresShell));
+  if (!shell)
+    return NS_ERROR_FAILURE;
+
+  nsIFrame *frame = nsnull;
+  nsCOMPtr<nsIContent> content(do_QueryInterface(aListNode));
+  shell->GetPrimaryFrameFor(content, &frame);
+
+  nsresult rv;
+  nsCOMPtr<nsIListControlFrame> listFrame(do_QueryInterface(frame, &rv));
+  if (NS_FAILED(rv))
+    return rv;  // How can list content not have a list frame?
+  NS_ASSERTION(listFrame, "We don't have a list frame, but rv returned a success code.");
+
+  // Get what's focused by asking frame for "selected item". 
+  // Don't use DOM method of getting selected item, which instead gives *first* selected option 
+  PRInt32 focusedOptionIndex = 0;
+  rv = listFrame->GetSelectedIndex(&focusedOptionIndex);  
+
+  nsCOMPtr<nsIDOMHTMLCollection> options;
+
+  // Get options
+  if (NS_SUCCEEDED(rv)) {
+    nsCOMPtr<nsIDOMHTMLSelectElement> selectElement(do_QueryInterface(aListNode));
+    NS_ASSERTION(selectElement, "No select element where it should be");
+    rv = selectElement->GetOptions(getter_AddRefs(options));
+  }
+
+  // Either use options and focused index, or default to list node itself
+  if (NS_SUCCEEDED(rv) && options && focusedOptionIndex >= 0)   // Something is focused
+    rv = options->Item(focusedOptionIndex, getter_AddRefs(aFocusedOptionNode));
+  else {  // If no options in list or focusedOptionIndex <0, then we are not focused on an item
+    aFocusedOptionNode = aListNode;  // return normal target content
+    rv = NS_OK;
+  }
+
+  return rv;
+}
+

mozilla/accessible/src/nsHTMLSelectListAccessible.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#ifndef __nsHTMLSelectListAccessible_h__
+#define __nsHTMLSelectListAccessible_h__
+
+#include "nsAccessible.h"
+
+#include "nsCOMPtr.h"
+
+/*
+ * The list that contains all the options in the select.
+ */
+class nsHTMLSelectListAccessible : public nsAccessible
+{
+public:
+  
+  nsHTMLSelectListAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLSelectListAccessible() {}
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+
+protected:
+  
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+/*
+ * Options inside the select, contained within the list
+ */
+class nsHTMLSelectOptionAccessible : public nsLeafAccessible
+{
+public:
+  
+  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+  static nsresult GetFocusedOptionNode(nsIWeakReference *aPresShell, nsIDOMNode *aListNode, nsCOMPtr<nsIDOMNode>& aFocusedOptionNode);
+
+protected:
+  
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+#endif

mozilla/accessible/src/nsHTMLTableAccessible.cpp

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLTableAccessible.h"
+#include "nsWeakReference.h"
+#include "nsReadableUtils.h"
+
+nsHTMLTableCellAccessible::nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsHTMLBlockAccessible(aDomNode, aShell)
+{ 
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_CELL;
+  return NS_OK;
+}
+
+nsHTMLTableAccessible::nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsHTMLBlockAccessible(aDomNode, aShell)
+{ 
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLTableAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_TABLE;
+  return NS_OK;
+}
+

mozilla/accessible/src/nsHTMLTableAccessible.h

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLTableAccessible_H_
+#define _nsHTMLTableAccessible_H_
+
+#include "nsAccessible.h"
+
+class nsHTMLTableCellAccessible : public nsHTMLBlockAccessible
+{
+public:
+  nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+};
+
+
+class nsHTMLTableAccessible : public nsHTMLBlockAccessible
+{
+public:
+  nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+};
+
+#endif  

mozilla/accessible/src/nsHTMLTextAccessible.cpp

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLTextAccessible.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+#include "nsString.h"
+#include "nsILink.h"
+#include "nsILinkHandler.h"
+#include "nsISelection.h"
+#include "nsISelectionController.h"
+#include "nsIPresContext.h"
+#include "nsReadableUtils.h"
+
+nsHTMLTextAccessible::nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsLinkableAccessible(aDomNode, aShell)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval)
+{ 
+
+  return mDOMNode->GetNodeValue(_retval);
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_TEXT;
+
+  return NS_OK;
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}

mozilla/accessible/src/nsHTMLTextAccessible.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+#ifndef _nsHTMLTextAccessible_H_
+#define _nsHTMLTextAccessible_H_
+
+#include "nsAccessible.h"
+
+class nsIWeakReference;
+class nsITextControlFrame;
+
+class nsHTMLTextAccessible : public nsLinkableAccessible
+{
+
+public:
+  nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+};
+
+#endif  

mozilla/accessible/src/nsRootAccessible.cpp

@@ -0,0 +1,478 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+#include "nsIAccessible.h"
+#include "nsRootAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIDOMEventTarget.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsReadableUtils.h"
+#include "nsILink.h"
+#include "nsHTMLFormControlAccessible.h"
+#include "nsHTMLLinkAccessible.h"
+#include "nsIURI.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIXULDocument.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMDocumentType.h"
+#include "nsINameSpaceManager.h"
+#include "nsIDOMNSHTMLSelectElement.h"
+#include "nsIAccessibleSelectable.h"
+#include "nsLayoutAtoms.h"
+#include "nsString.h"
+#include "nsXPIDLString.h"
+#include "nsIAccessibilityService.h"
+#include "nsIServiceManager.h"
+#include "nsHTMLSelectListAccessible.h"
+#include "nsIDOMHTMLSelectElement.h"
+
+NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
+  NS_INTERFACE_MAP_ENTRY(nsIAccessibleDocument)
+  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMFormListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormListener)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener)
+NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
+
+
+NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
+NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
+
+//-----------------------------------------------------
+// construction 
+//-----------------------------------------------------
+nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell):nsAccessible(nsnull,aShell), 
+  nsDocAccessibleMixin(aShell), mAccService(do_GetService("@mozilla.org/accessibilityService;1"))
+{
+  mListener = nsnull;
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
+
+  shell->GetDocument(getter_AddRefs(mDocument));
+  mDOMNode = do_QueryInterface(mDocument);
+
+  nsLayoutAtoms::AddRefAtoms();
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsRootAccessible::~nsRootAccessible()
+{
+  nsLayoutAtoms::ReleaseAtoms();
+  RemoveAccessibleEventListener(mListener);
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsRootAccessible::GetAccName(nsAWritableString& aAccName) 
+{ 
+  return GetTitle(aAccName);
+}
+
+// helpers
+nsIFrame* nsRootAccessible::GetFrame()
+{
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell)
+    return nsnull;
+
+  nsIFrame* root = nsnull;
+  if (shell) 
+    shell->GetRootFrame(&root);
+
+  return root;
+}
+
+void nsRootAccessible::GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame)
+{
+  *aRelativeFrame = GetFrame();
+  (*aRelativeFrame)->GetRect(aBounds);
+}
+
+/* readonly attribute nsIAccessible accParent; */
+NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
+{ 
+  *aAccParent = nsnull;
+  return NS_OK;
+}
+
+/* readonly attribute unsigned long accRole; */
+NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUint32 *aAccRole) 
+{ 
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell) {
+    *aAccRole = 0;
+    return NS_ERROR_FAILURE;
+  }
+
+  /*
+  // Commenting this out for now.
+  // It was requested that we always use pane objects instead of client objects.
+  // However, it might be asked that we put client objects back.
+
+  nsCOMPtr<nsIPresContext> context; 
+  shell->GetPresContext(getter_AddRefs(context));
+  nsCOMPtr<nsISupports> container;
+  context->GetContainer(getter_AddRefs(container));
+  if (container) {
+    nsCOMPtr<nsIDocShellTreeItem> parentTreeItem, docTreeItem(do_QueryInterface(container));
+    if (docTreeItem) {
+      docTreeItem->GetSameTypeParent(getter_AddRefs(parentTreeItem));
+      // Basically, if this docshell has a parent of the same type, it's a frame
+      if (parentTreeItem) {
+        *aAccRole = ROLE_PANE;
+        return NS_OK;
+      }
+    }
+  }
+
+  *aAccRole = ROLE_CLIENT;
+  */
+
+  *aAccRole = ROLE_PANE;
+  return NS_OK;  
+}
+
+NS_IMETHODIMP nsRootAccessible::GetAccState(PRUint32 *aAccState)
+{
+  return nsDocAccessibleMixin::GetAccState(aAccState);
+}
+
+
+NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAWritableString& aAccValue)
+{
+  return GetURL(aAccValue);
+}
+
+/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (!mListener)
+  {
+    // add an event listener to the document
+    nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+    if (!shell)
+      return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsIDocument> document;
+    shell->GetDocument(getter_AddRefs(document));
+
+    // use AddEventListener from the nsIDOMEventTarget interface
+    nsCOMPtr<nsIDOMEventTarget> target;
+    if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventTarget), getter_AddRefs(target))) && target)
+    {
+      nsresult rv = NS_OK;
+      // we're a DOMEventListener now!!
+      nsCOMPtr<nsIDOMEventListener> listener;
+      rv = this->QueryInterface( NS_GET_IID(nsIDOMEventListener), getter_AddRefs(listener) );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to QI");
+      // capture DOM focus events 
+      rv = target->AddEventListener( NS_LITERAL_STRING("focus") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+      // capture Form change events 
+      rv = target->AddEventListener( NS_LITERAL_STRING("change") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+      // add ourself as a CheckboxStateChange listener ( custom event fired in nsHTMLInputElement.cpp )
+      rv = target->AddEventListener( NS_LITERAL_STRING("CheckboxStateChange") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+      // add ourself as a RadiobuttonStateChange listener ( custom event fired in nsHTMLInputElement.cpp )
+      rv = target->AddEventListener( NS_LITERAL_STRING("RadiobuttonStateChange") , listener, PR_TRUE );
+      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+    }
+  }
+
+  // create a weak reference to the listener
+  mListener =  aListener;
+
+  return NS_OK;
+}
+
+/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (mListener)
+  {
+     nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+     nsCOMPtr<nsIDocument> document;
+     if (!shell)
+       return NS_OK;
+
+     shell->GetDocument(getter_AddRefs(document));
+
+     nsCOMPtr<nsIDOMEventReceiver> erP;
+     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
+     {
+        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+     }
+  }
+
+  mListener = nsnull;
+
+  return NS_OK;
+}
+
+// --------------- nsIDOMEventListener Methods (3) ------------------------
+
+NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
+{
+  if (mListener) {
+    // optionTargetNode is set to current option for HTML selects
+    nsCOMPtr<nsIDOMNode> targetNode, optionTargetNode; 
+    nsresult rv = GetTargetNode(aEvent, targetNode);
+    if (NS_FAILED(rv))
+      return rv;
+
+    // Check to see if it's a select element. If so, need the currently focused option
+    nsCOMPtr<nsIDOMHTMLSelectElement> selectElement(do_QueryInterface(targetNode));
+    if (selectElement)     // ----- Target Node is an HTML <select> element ------
+      nsHTMLSelectOptionAccessible::GetFocusedOptionNode(mPresShell, targetNode, optionTargetNode);
+
+    nsAutoString eventType;
+    aEvent->GetType(eventType);
+
+    nsCOMPtr<nsIAccessible> accessible;
+
+    if (NS_SUCCEEDED(mAccService->GetAccessibleFor(targetNode, getter_AddRefs(accessible)))) {
+      if ( eventType.EqualsIgnoreCase("focus") ) {
+        if (mCurrentFocus != targetNode) {
+          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
+          mCurrentFocus = targetNode;
+        }
+      }
+      else if ( eventType.EqualsIgnoreCase("change") ) {
+        if (optionTargetNode) {   // Set to current option only for HTML selects
+          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_SELECTION, accessible);
+          if (mCurrentFocus != optionTargetNode &&
+            NS_SUCCEEDED(mAccService->GetAccessibleFor(optionTargetNode, getter_AddRefs(accessible)))) {
+              mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
+              mCurrentFocus = optionTargetNode;
+          }
+        }
+        else 
+          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      }
+      else if ( eventType.EqualsIgnoreCase("CheckboxStateChange") ) {
+        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      }
+      else if ( eventType.EqualsIgnoreCase("RadiobuttonStateChange") ) {
+        mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
+      }
+    }
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsCOMPtr<nsIDOMNode>& aTargetNode)
+{
+  nsCOMPtr<nsIDOMEventTarget> domEventTarget;
+  aEvent->GetOriginalTarget(getter_AddRefs(domEventTarget));
+
+  nsresult rv;
+  aTargetNode = do_QueryInterface(domEventTarget, &rv);
+
+  return rv;
+}
+
+// ------- nsIDOMFocusListener Methods (1) -------------
+
+NS_IMETHODIMP nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
+{ 
+  return HandleEvent(aEvent);
+}
+
+NS_IMETHODIMP nsRootAccessible::Blur(nsIDOMEvent* aEvent) { return NS_OK; }
+
+// ------- nsIDOMFormListener Methods (5) -------------
+
+NS_IMETHODIMP nsRootAccessible::Submit(nsIDOMEvent* aEvent) { return NS_OK; }
+
+NS_IMETHODIMP nsRootAccessible::Reset(nsIDOMEvent* aEvent) { return NS_OK; }
+
+NS_IMETHODIMP nsRootAccessible::Change(nsIDOMEvent* aEvent)
+{
+  // get change events when the form elements changes its state, checked->not,
+  //  deleted text, new text, change in selection for list/combo boxes
+  // this may be the event that we have the individual Accessible objects
+  //  handle themselves -- have list/combos figure out the change in selection
+  //  have textareas and inputs fire a change of state etc...
+  return HandleEvent(aEvent);
+}
+
+// gets Select events when text is selected in a textarea or input
+NS_IMETHODIMP nsRootAccessible::Select(nsIDOMEvent* aEvent) { return NS_OK; }
+
+// gets Input events when text is entered or deleted in a textarea or input
+NS_IMETHODIMP nsRootAccessible::Input(nsIDOMEvent* aEvent) { return NS_OK; }
+
+// ------- nsIAccessibleDocument Methods (5) ---------------
+
+NS_IMETHODIMP nsRootAccessible::GetURL(nsAWritableString& aURL)
+{
+  return nsDocAccessibleMixin::GetURL(aURL);
+}
+
+NS_IMETHODIMP nsRootAccessible::GetTitle(nsAWritableString& aTitle)
+{
+  return nsDocAccessibleMixin::GetTitle(aTitle);
+}
+
+NS_IMETHODIMP nsRootAccessible::GetMimeType(nsAWritableString& aMimeType)
+{
+  return nsDocAccessibleMixin::GetMimeType(aMimeType);
+}
+
+NS_IMETHODIMP nsRootAccessible::GetDocType(nsAWritableString& aDocType)
+{
+  return nsDocAccessibleMixin::GetDocType(aDocType);
+}
+
+NS_IMETHODIMP nsRootAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
+{
+  return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI);
+}
+
+NS_IMETHODIMP nsRootAccessible::GetDocument(nsIDocument **doc)
+{
+  return nsDocAccessibleMixin::GetDocument(doc);
+}
+
+
+nsDocAccessibleMixin::nsDocAccessibleMixin(nsIDocument *aDoc):mDocument(aDoc)
+{
+}
+
+nsDocAccessibleMixin::nsDocAccessibleMixin(nsIWeakReference *aPresShell)
+{
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(aPresShell));
+  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
+  shell->GetDocument(getter_AddRefs(mDocument));
+}
+
+nsDocAccessibleMixin::~nsDocAccessibleMixin()
+{
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAWritableString& aURL)
+{ 
+  nsCOMPtr<nsIURI> pURI;
+  mDocument->GetDocumentURL(getter_AddRefs(pURI));
+  nsXPIDLCString path;
+  pURI->GetSpec(getter_Copies(path));
+  aURL.Assign(NS_ConvertUTF8toUCS2(path).get());
+  //XXXaaronl Need to use CopyUTF8toUCS2(nsDependentCString(path), aURL); when it's written
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetTitle(nsAWritableString& aTitle)
+{
+  // This doesn't leak - we don't own the const pointer that's returned
+  aTitle = *(mDocument->GetDocumentTitle());
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAWritableString& aMimeType)
+{
+  if (mDocument)
+    return mDocument->GetContentType(aMimeType); 
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAWritableString& aDocType)
+{
+  nsCOMPtr<nsIXULDocument> xulDoc(do_QueryInterface(mDocument));
+  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(mDocument));
+  nsCOMPtr<nsIDOMDocumentType> docType;
+
+  if (xulDoc) {
+    aDocType = NS_LITERAL_STRING("window"); // doctype not implemented for XUL at time of writing - causes assertion
+    return NS_OK;
+  }
+  else if (domDoc && NS_SUCCEEDED(domDoc->GetDoctype(getter_AddRefs(docType))) && docType) {
+    return docType->GetName(aDocType);
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
+{
+  if (mDocument) {
+    nsCOMPtr<nsINameSpaceManager> nameSpaceManager;
+    if (NS_SUCCEEDED(mDocument->GetNameSpaceManager(*getter_AddRefs(nameSpaceManager)))) 
+      return nameSpaceManager->GetNameSpaceURI(aNameSpaceID, aNameSpaceURI);
+  }
+  return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetDocument(nsIDocument **doc)
+{
+  *doc = mDocument;
+  if (mDocument) {
+    NS_IF_ADDREF(*doc);
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetAccState(PRUint32 *aAccState)
+{
+  // Screen readers need to know when the document is finished loading (STATE_BUSY flag)
+  // We do it this way, rather than via nsIWebProgressListener, because
+  // if accessibility was turned on after a document already finished loading, 
+  // we would get no state changes from nsIWebProgressListener.
+  // The GetBusyFlags method, however, always has the current busy state information for us.
+
+  *aAccState = 0;
+  if (mDocument) {
+    nsCOMPtr<nsIPresShell> presShell;
+    mDocument->GetShellAt(0, getter_AddRefs(presShell));
+    if (presShell) {
+      nsCOMPtr<nsIPresContext> context; 
+      presShell->GetPresContext(getter_AddRefs(context));
+      if (context) {
+        nsCOMPtr<nsISupports> container;
+        context->GetContainer(getter_AddRefs(container));
+        if (container) {
+          nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
+          if (docShell) {
+            PRUint32 busyFlags;
+            docShell->GetBusyFlags(&busyFlags);
+            if (busyFlags != nsIDocShell::BUSY_FLAGS_NONE)
+              *aAccState = nsIAccessible::STATE_BUSY;
+          }
+        }
+      }
+    }
+  }
+  return NS_OK;
+}

mozilla/accessible/src/nsRootAccessible.h

@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+#ifndef _nsRootAccessible_H_
+#define _nsRootAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsIAccessibleEventReceiver.h"
+#include "nsIAccessibleEventListener.h"
+#include "nsIAccessibleDocument.h"
+#include "nsIDOMFormListener.h"
+#include "nsIDOMFocusListener.h"
+#include "nsIDocument.h"
+#include "nsIAccessibilityService.h"
+
+class nsDocAccessibleMixin
+{
+  public:
+    nsDocAccessibleMixin(nsIDocument *doc);
+    nsDocAccessibleMixin(nsIWeakReference *aShell);
+    virtual ~nsDocAccessibleMixin();
+
+    NS_DECL_NSIACCESSIBLEDOCUMENT
+
+    NS_IMETHOD GetAccState(PRUint32 *aAccState);
+
+  protected:
+    nsCOMPtr<nsIDocument> mDocument;
+};
+
+class nsRootAccessible : public nsAccessible,
+                         public nsDocAccessibleMixin,
+                         public nsIAccessibleDocument,
+                         public nsIAccessibleEventReceiver,
+                         public nsIDOMFocusListener,
+                         public nsIDOMFormListener
+
+{
+  NS_DECL_ISUPPORTS_INHERITED
+
+  public:
+    nsRootAccessible(nsIWeakReference* aShell);
+    virtual ~nsRootAccessible();
+
+    /* attribute wstring accName; */
+    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
+    NS_IMETHOD GetAccValue(nsAWritableString& aAccValue);
+    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
+    NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
+    NS_IMETHOD GetAccState(PRUint32 *aAccState);
+
+    // ----- nsIAccessibleEventReceiver -------------------
+
+    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
+    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
+
+    // ----- nsIDOMEventListener --------------------------
+    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
+
+    // ----- nsIDOMFocusListener --------------------------
+    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
+    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
+
+    // ----- nsIDOMFormListener ---------------------------
+    NS_IMETHOD Submit(nsIDOMEvent* aEvent);
+    NS_IMETHOD Reset(nsIDOMEvent* aEvent);
+    NS_IMETHOD Change(nsIDOMEvent* aEvent);
+    NS_IMETHOD Select(nsIDOMEvent* aEvent);
+    NS_IMETHOD Input(nsIDOMEvent* aEvent);
+
+    NS_DECL_NSIACCESSIBLEDOCUMENT
+
+  protected:
+    NS_IMETHOD GetTargetNode(nsIDOMEvent *aEvent, nsCOMPtr<nsIDOMNode>& aTargetNode);
+    virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
+    virtual nsIFrame* GetFrame();
+
+    // not a com pointer. We don't own the listener
+    // it is the callers responsibility to remove the listener
+    // otherwise we will get into circular referencing problems
+    nsIAccessibleEventListener* mListener;
+    nsCOMPtr<nsIDOMNode> mCurrentFocus;
+    nsCOMPtr<nsIAccessibilityService> mAccService;
+};
+
+
+#endif  

mozilla/accessible/src/xul/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_xul_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  locale \
-  necko \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  webbrwsr \
-  $(NULL)
-
-CPPSRCS = \
-  nsXULColorPickerAccessible.cpp \
-  nsXULFormControlAccessible.cpp \
-  nsXULMenuAccessible.cpp \
-  nsXULSelectAccessible.cpp \
-  nsXULTabAccessible.cpp \
-  nsXULTextAccessible.cpp \
-  $(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../base \
-  -I$(srcdir)/../html \
-  $(NULL)

mozilla/accessible/src/xul/makefile.win

@@ -1,67 +0,0 @@
-#!gmake
-#
-# 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 = ..\..\..
-MODULE = accessibility
-LIBRARY_NAME = accessibility_xul_s
-REQUIRES = \
-  content \
-  dom \
-  gfx \
-  layout \
-  necko \
-  string \
-  widget \
-  xpcom \
-  $(NULL)
-
-CPP_OBJS = \
-  .\$(OBJDIR)\nsXULColorPickerAccessible.obj \
-  .\$(OBJDIR)\nsXULFormControlAccessible.obj \
-  .\$(OBJDIR)\nsXULMenuAccessible.obj \
-  .\$(OBJDIR)\nsXULSelectAccessible.obj \
-  .\$(OBJDIR)\nsXULTabAccessible.obj \
-  .\$(OBJDIR)\nsXULTextAccessible.obj \
-  $(NULL)
-
-EXPORTS = \
-  $(NULL)
-
-LINCS = \
-  -I..\base \
-  -I..\html \
-  -I..\..\..\layout\html\forms\public \
-  -I..\..\..\layout\html\forms\src \
-  -I..\..\..\layout\html\base\src \
-  $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-
-
-

mozilla/accessible/src/xul/nsXULColorPickerAccessible.cpp

@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-// NOTE: alphabetically ordered
-#include "nsXULColorPickerAccessible.h"
-#include "nsReadableUtils.h"
-#include "nsString.h"
-#include "nsXULFormControlAccessible.h"
-#include "nsIDOMElement.h"
-
-
-/**
-  * XUL Color Picker Tile
-  */
-
-/**
-  * Default Constructor
-  */
-nsXULColorPickerTileAccessible::nsXULColorPickerTileAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * We are a pushbutton
-  */
-NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PUSHBUTTON;
-  return NS_OK;
-}
-
-/**
-  * Possible states: focused, focusable, selected
-  */
-NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccState(PRUint32 *_retval)
-{
-  // get focus and disable status from base class
-  nsFormControlAccessible::GetAccState(_retval);
-  *_retval |= STATE_FOCUSABLE;
-
-  // Focused?
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No XUL Element for colorpicker");
-  PRBool isFocused = PR_FALSE;
-  element->HasAttribute(NS_LITERAL_STRING("hover"), &isFocused);
-  if (isFocused)
-    *_retval |= STATE_FOCUSED;
-
-  PRBool isSelected = PR_FALSE;
-  element->HasAttribute(NS_LITERAL_STRING("selected"), &isSelected);
-  if (isFocused)
-    *_retval |= STATE_SELECTED;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccName(nsAString& _retval)
-{
-  _retval.Assign(NS_LITERAL_STRING(""));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccValue(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No XUL Element for colorpicker");
-  return element->GetAttribute(NS_LITERAL_STRING("color"), _retval);
-}
-
-/**
-  * XUL Color Picker
-  */
-
-/**
-  * Default Constructor
-  */
-nsXULColorPickerAccessible::nsXULColorPickerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsXULColorPickerTileAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * Possible states: focused, focusable, unavailable(disabled)
-  */
-NS_IMETHODIMP nsXULColorPickerAccessible::GetAccState(PRUint32 *_retval)
-{
-  // get focus and disable status from base class
-  nsFormControlAccessible::GetAccState(_retval);
-  *_retval |= STATE_FOCUSABLE | STATE_HASPOPUP;
-
-  return NS_OK;
-}
-

mozilla/accessible/src/xul/nsXULColorPickerAccessible.h

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef _nsXULColorPickerAccessible_H_
-#define _nsXULColorPickerAccessible_H_
-
-// NOTE: alphabetically ordered
-#include "nsFormControlAccessible.h"
-
-class nsXULColorPickerTileAccessible : public nsFormControlAccessible
-{
-public:
-  nsXULColorPickerTileAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccName(nsAString& _retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-};
-
-class nsXULColorPickerAccessible : public nsXULColorPickerTileAccessible
-{
-public:
-  nsXULColorPickerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp

@@ -1,566 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-// NOTE: alphabetically ordered
-#include "nsIDocument.h"
-#include "nsIDOMNodeList.h"
-#include "nsIDOMXULButtonElement.h"
-#include "nsIDOMXULCheckboxElement.h"
-#include "nsIDOMXULDescriptionElement.h"
-#include "nsIDOMXULDocument.h"
-#include "nsIDOMXULLabelElement.h"
-#include "nsIDOMXULMenuListElement.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-#include "nsReadableUtils.h"
-#include "nsString.h"
-#include "nsXULFormControlAccessible.h"
-#include "nsIAccessibilityService.h"
-#include "nsIServiceManager.h"
-
-/**
-  * XUL Button: can contain arbitrary HTML content
-  */
-
-/**
-  * Default Constructor
-  */
-
-// Don't inherit from nsFormControlAccessible - it doesn't allow children and a button can have a dropmarker child
-nsXULButtonAccessible::nsXULButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell), mAccService(do_GetService("@mozilla.org/accessibilityService;1"))
-{ 
-}
-
-NS_IMETHODIMP nsXULButtonAccessible::GetAccName(nsAString& aResult)
-{
-  return GetXULAccName(aResult);
-}
-
-/**
-  * Only one actions available
-  */
-NS_IMETHODIMP nsXULButtonAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eSingle_Action;
-  return NS_OK;;
-}
-
-/**
-  * Return the name of our only action
-  */
-NS_IMETHODIMP nsXULButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); 
-    return NS_OK;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  * Tell the button to do it's action
-  */
-NS_IMETHODIMP nsXULButtonAccessible::AccDoAction(PRUint8 index)
-{
-  if (index == 0) {
-    nsCOMPtr<nsIDOMXULButtonElement> buttonElement(do_QueryInterface(mDOMNode));
-    if ( buttonElement )
-    {
-      buttonElement->DoCommand();
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  * We are a pushbutton
-  */
-NS_IMETHODIMP nsXULButtonAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PUSHBUTTON;
-  return NS_OK;
-}
-
-/**
-  * Possible states: focused, focusable, unavailable(disabled)
-  */
-NS_IMETHODIMP nsXULButtonAccessible::GetAccState(PRUint32 *_retval)
-{
-  // get focus and disable status from base class
-  nsAccessible::GetAccState(_retval);
-
-  PRBool disabled = PR_FALSE;
-  nsCOMPtr<nsIDOMXULControlElement> xulFormElement(do_QueryInterface(mDOMNode));  
-  if (xulFormElement) {
-    xulFormElement->GetDisabled(&disabled);
-    if (disabled)
-      *_retval |= STATE_UNAVAILABLE;
-    else 
-      *_retval |= STATE_FOCUSABLE;
-  }
-
-  // Buttons can be checked -- they simply appear pressed in rather than checked
-  nsCOMPtr<nsIDOMXULButtonElement> xulButtonElement(do_QueryInterface(mDOMNode));
-  if (xulButtonElement) {
-    PRBool checked = PR_FALSE;
-    PRInt32 checkState = 0;
-    xulButtonElement->GetChecked(&checked);
-    if (checked) {
-      *_retval |= STATE_PRESSED;
-      xulButtonElement->GetCheckState(&checkState);
-      if (checkState == nsIDOMXULButtonElement::CHECKSTATE_MIXED)  
-        *_retval |= STATE_MIXED;
-    }
-  }
-
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No nsIDOMElement for button node!");
-  PRBool isDefault = PR_FALSE;
-  element->HasAttribute(NS_LITERAL_STRING("default"), &isDefault) ;
-  if (isDefault)
-    *_retval |= STATE_DEFAULT;
-
-  return NS_OK;
-}
-
-/**
-  * Perhaps 1 child - if there's a <dropmarker>
-  */
-NS_IMETHODIMP nsXULButtonAccessible::GetAccFirstChild(nsIAccessible **aResult)
-{
-  *aResult = nsnull;
-
-  nsCOMPtr<nsIAccessible> testAccessible;
-  nsAccessible::GetAccLastChild(getter_AddRefs(testAccessible));
-
-  // If the anonymous tree walker can find accessible children, and the last one is a push button, 
-  // then use it as the only accessible child -- because this is the scenario where we have a dropmarker child
-
-  if (testAccessible) {    
-    PRUint32 role;
-    if (NS_SUCCEEDED(testAccessible->GetAccRole(&role)) && role == ROLE_PUSHBUTTON) {
-      *aResult = testAccessible;
-      NS_ADDREF(*aResult);
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULButtonAccessible::GetAccLastChild(nsIAccessible **aResult)
-{
-  return GetAccFirstChild(aResult);
-}
-
-NS_IMETHODIMP nsXULButtonAccessible::GetAccChildCount(PRInt32 *aResult)
-{
-  *aResult = 0;
-
-  nsCOMPtr<nsIAccessible> accessible;
-  GetAccFirstChild(getter_AddRefs(accessible));
-  if (accessible)
-    *aResult = 1;
-
-  return NS_OK;
-}
-
-/**
-  * XUL Dropmarker: can contain arbitrary HTML content
-  */
-
-/**
-  * Default Constructor
-  */
-nsXULDropmarkerAccessible::nsXULDropmarkerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * Only one actions available
-  */
-NS_IMETHODIMP nsXULDropmarkerAccessible::GetAccNumActions(PRUint8 *aResult)
-{
-  *aResult = eSingle_Action;
-  return NS_OK;;
-}
-
-PRBool nsXULDropmarkerAccessible::DropmarkerOpen(PRBool aToggleOpen)
-{
-  PRBool isOpen = PR_FALSE;
-
-  nsCOMPtr<nsIDOMNode> parentButtonNode;
-  mDOMNode->GetParentNode(getter_AddRefs(parentButtonNode));
-  nsCOMPtr<nsIDOMXULButtonElement> parentButtonElement(do_QueryInterface(parentButtonNode));
-
-  if (parentButtonElement) {
-    parentButtonElement->GetOpen(&isOpen);
-    if (aToggleOpen)
-      parentButtonElement->SetOpen(!isOpen);
-  }
-  else {
-    nsCOMPtr<nsIDOMXULMenuListElement> parentMenuListElement(do_QueryInterface(parentButtonNode));
-    if (parentMenuListElement) {
-      parentMenuListElement->GetOpen(&isOpen);
-      if (aToggleOpen)
-        parentMenuListElement->SetOpen(!isOpen);
-    }
-  }
-
-  return isOpen;
-}
-
-/**
-  * Return the name of our only action
-  */
-NS_IMETHODIMP nsXULDropmarkerAccessible::GetAccActionName(PRUint8 index, nsAString& aResult)
-{
-  if (index == eAction_Click) {
-    if (DropmarkerOpen(PR_FALSE))
-      aResult = NS_LITERAL_STRING("close");
-    else
-      aResult = NS_LITERAL_STRING("open");
-    return NS_OK;
-  }
-
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  * Tell the Dropmarker to do it's action
-  */
-NS_IMETHODIMP nsXULDropmarkerAccessible::AccDoAction(PRUint8 index)
-{
-  if (index == eAction_Click) {
-    DropmarkerOpen(PR_TRUE); // Reverse the open attribute
-    return NS_OK;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  * We are a pushbutton
-  */
-NS_IMETHODIMP nsXULDropmarkerAccessible::GetAccRole(PRUint32 *aResult)
-{
-  *aResult = ROLE_PUSHBUTTON;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULDropmarkerAccessible::GetAccState(PRUint32 *aResult)
-{
-  *aResult = 0;
-  
-  if (DropmarkerOpen(PR_FALSE))
-    *aResult = STATE_PRESSED;
-
-  return NS_OK;
-}
-
-/**
-  * XUL checkbox
-  */
-
-/**
-  * Default Constructor
-  */
-nsXULCheckboxAccessible::nsXULCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsFormControlAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * We are a CheckButton
-  */
-NS_IMETHODIMP nsXULCheckboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_CHECKBUTTON;
-  return NS_OK;
-}
-
-/**
-  * Only one action available
-  */
-NS_IMETHODIMP nsXULCheckboxAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eSingle_Action;
-  return NS_OK;
-}
-
-/**
-  * Return the name of our only action
-  */
-NS_IMETHODIMP nsXULCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  if (index == eAction_Click) {
-    // check or uncheck
-    PRUint32 state;
-    GetAccState(&state);
-
-    if (state & STATE_CHECKED)
-      _retval = NS_LITERAL_STRING("uncheck");
-    else
-      _retval = NS_LITERAL_STRING("check");
-
-    return NS_OK;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  * Tell the checkbox to do its only action -- check( or uncheck) itself
-  */
-NS_IMETHODIMP nsXULCheckboxAccessible::AccDoAction(PRUint8 index)
-{
-  if (index == eAction_Click) {
-    PRBool checked = PR_FALSE;
-    nsCOMPtr<nsIDOMXULCheckboxElement> xulCheckboxElement(do_QueryInterface(mDOMNode));
-    if (xulCheckboxElement) {
-      xulCheckboxElement->GetChecked(&checked);
-      xulCheckboxElement->SetChecked(!checked);
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/**
-  * Possible states: focused, focusable, unavailable(disabled), checked
-  */
-NS_IMETHODIMP nsXULCheckboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus and disable status from base class
-  nsFormControlAccessible::GetAccState(_retval);
-
-  // Determine Checked state
-  nsCOMPtr<nsIDOMXULCheckboxElement> xulCheckboxElement(do_QueryInterface(mDOMNode));
-  if (xulCheckboxElement) {
-    PRBool checked = PR_FALSE;
-    xulCheckboxElement->GetChecked(&checked);
-    if (checked) {
-      *_retval |= STATE_CHECKED;
-      PRInt32 checkState = 0;
-      xulCheckboxElement->GetCheckState(&checkState);
-      if (checkState == nsIDOMXULCheckboxElement::CHECKSTATE_MIXED)   
-        *_retval |= STATE_MIXED;
-    }
-  }
-  
-  return NS_OK;
-}
-
-/**
-  * XUL groupbox
-  */
-
-nsXULGroupboxAccessible::nsXULGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-NS_IMETHODIMP nsXULGroupboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_GROUPING;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULGroupboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Groupbox doesn't support any states!
-  *_retval = 0;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULGroupboxAccessible::GetAccName(nsAString& _retval)
-{
-  _retval.Assign(NS_LITERAL_STRING(""));  // Default name is blank 
-
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  if (element) {
-    nsCOMPtr<nsIDOMNodeList> captions;
-    element->GetElementsByTagName(NS_LITERAL_STRING("caption"), getter_AddRefs(captions));
-    if (captions) {
-      nsCOMPtr<nsIDOMNode> captionNode;
-      captions->Item(0, getter_AddRefs(captionNode));
-      if (captionNode) {
-        element = do_QueryInterface(captionNode);
-        NS_ASSERTION(element, "No nsIDOMElement for caption node!");
-        element->GetAttribute(NS_LITERAL_STRING("label"), _retval) ;
-      }
-    }
-  }
-  return NS_OK;
-}
-
-/**
-  * progressmeter
-  */
-
-nsXULProgressMeterAccessible::nsXULProgressMeterAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-NS_IMETHODIMP nsXULProgressMeterAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PROGRESSBAR;
-  return NS_OK;
-}
-
-/**
-  * No states supported for progressmeter
-  */
-NS_IMETHODIMP nsXULProgressMeterAccessible::GetAccState(PRUint32 *_retval)
-{
-  *_retval =0;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULProgressMeterAccessible::GetAccValue(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No element for DOM node!");
-  element->GetAttribute(NS_LITERAL_STRING("value"), _retval);
-  _retval.Append(NS_LITERAL_STRING("%"));
-  return NS_OK;
-}
-
-/**
-  * XUL Radio Button
-  */
-
-/** Constructor */
-nsXULRadioButtonAccessible::nsXULRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsRadioButtonAccessible(aNode, aShell)
-{ 
-}
-
-/** Our only action is to click */
-NS_IMETHODIMP nsXULRadioButtonAccessible::AccDoAction(PRUint8 index)
-{
-  if (index == eAction_Click) {
-    nsCOMPtr<nsIDOMXULSelectControlItemElement> radioButton(do_QueryInterface(mDOMNode));
-    if (radioButton) {
-        radioButton->DoCommand();
-        return NS_OK;
-    }
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/** We are Focusable and can be Checked and focused */
-NS_IMETHODIMP nsXULRadioButtonAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsFormControlAccessible::GetAccState(_retval);
-  PRBool selected = PR_FALSE;   // Radio buttons can be selected
-
-  nsCOMPtr<nsIDOMXULSelectControlItemElement> radioButton(do_QueryInterface(mDOMNode));
-  if (radioButton) 
-    radioButton->GetSelected(&selected);
-
-  if (selected) 
-    *_retval |= STATE_CHECKED;
-
-  return NS_OK;
-}
-
-/**
-  * This gets the parent of the RadioGroup (our grandparent) and sets it 
-  *  as our parent, for future calls. 
-  */
-NS_IMETHODIMP nsXULRadioButtonAccessible::GetAccParent(nsIAccessible **  aAccParent)
-{
-  if (! mParent) {
-    nsCOMPtr<nsIAccessible> tempParent;
-    nsAccessible::GetAccParent(getter_AddRefs(tempParent));
-    if (tempParent)
-      tempParent->GetAccParent(getter_AddRefs(mParent));
-  }
-  NS_ASSERTION(mParent,"Whoa! This RadioButtonAcc doesn't have a parent! Better find out why.");
-  *aAccParent = mParent;
-  NS_ADDREF(*aAccParent);
-  return NS_OK;
-}
-
-/**
-  * XUL Radio Group
-  *   The Radio Group proxies for the Radio Buttons themselves. The Group gets
-  *   focus whereas the Buttons do not. So we only have an accessible object for
-  *   this for the purpose of getting the proper RadioButton. Need this here to 
-  *   avoid circular reference problems when navigating the accessible tree and
-  *   for getting to the radiobuttons.
-  */
-
-/** Constructor */
-nsXULRadioGroupAccessible::nsXULRadioGroupAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * XUL StatusBar: can contain arbitrary HTML content
-  */
-
-/**
-  * Default Constructor
-  */
-nsXULStatusBarAccessible::nsXULStatusBarAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * We are a statusbar
-  */
-NS_IMETHODIMP nsXULStatusBarAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_STATUSBAR;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULStatusBarAccessible::GetAccState(PRUint32 *_retval)
-{
-  *_retval = 0;  // no special state flags for status bar
-  return NS_OK;
-}

mozilla/accessible/src/xul/nsXULFormControlAccessible.h

@@ -1,136 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef _nsXULFormControlAccessible_H_
-#define _nsXULFormControlAccessible_H_
-
-// NOTE: alphabetically ordered
-#include "nsBaseWidgetAccessible.h"
-#include "nsFormControlAccessible.h"
-#include "nsHTMLFormControlAccessible.h"
-
-class nsXULButtonAccessible : public nsAccessible
-// Don't inherit from nsFormControlAccessible - it doesn't allow children and a button can have a dropmarker child
-{
-public:
-  nsXULButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& aResult);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-private:
-  nsCOMPtr<nsIAccessibilityService> mAccService;
-
-};
-
-class nsXULCheckboxAccessible : public nsFormControlAccessible
-{
-public:
-  nsXULCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-};
-
-class nsXULDropmarkerAccessible : public nsFormControlAccessible
-{
-public:
-  nsXULDropmarkerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-
-private:
-  PRBool DropmarkerOpen(PRBool aToggleOpen);
-};
-
-class nsXULGroupboxAccessible : public nsAccessible
-{
-public:
-  nsXULGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAString& _retval);
-};
-
-class nsXULProgressMeterAccessible : public nsAccessible
-{
-public:
-  nsXULProgressMeterAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAString &_retval);
-};
-
-class nsXULRadioButtonAccessible : public nsRadioButtonAccessible
-{
-
-public:
-  nsXULRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-};
-
-class nsXULRadioGroupAccessible : public nsAccessible
-{
-public:
-  nsXULRadioGroupAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-};
-
-class nsXULStatusBarAccessible : public nsAccessible
-{
-public:
-  nsXULStatusBarAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-};
-
-#endif  
-

mozilla/accessible/src/xul/nsXULMenuAccessible.cpp

@@ -1,264 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 "nsXULMenuAccessible.h"
-#include "nsAccessible.h"
-#include "nsIAccessible.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMXULPopupElement.h"
-
-// ------------------------ Menu Item -----------------------------
-
-nsXULMenuitemAccessible::nsXULMenuitemAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell): 
-nsAccessible(aDOMNode, aShell)
-{ 
-}
-
-
-NS_IMETHODIMP nsXULMenuitemAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsAccessible::GetAccState(_retval);
-
-  // Focused?
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No DOM element for menu  node!");
-  PRBool isFocused = PR_FALSE;
-  element->HasAttribute(NS_LITERAL_STRING("_moz-menuactive"), &isFocused); 
-  if (isFocused)
-    *_retval |= STATE_FOCUSED;
-
-  // Has Popup?
-  nsAutoString tagName;
-  element->GetLocalName(tagName);
-  if (tagName.Equals(NS_LITERAL_STRING("menu")))
-    *_retval |= STATE_HASPOPUP;
-
-  nsAutoString menuItemType;
-  element->GetAttribute(NS_LITERAL_STRING("type"), menuItemType); 
-
-  if (!menuItemType.IsEmpty()) {
-    // Selectable?
-    if (menuItemType.Equals(NS_LITERAL_STRING("radio")))
-      *_retval |= STATE_SELECTABLE;
-
-    // Checked?
-    PRBool isChecked = PR_FALSE;
-    element->HasAttribute(NS_LITERAL_STRING("checked"), &isChecked); 
-    if (isChecked) {
-      if (*_retval & STATE_SELECTABLE)
-        *_retval |= STATE_SELECTED;  // Use STATE_SELECTED for radio buttons
-      else *_retval |= STATE_CHECKED;
-    }
-  }
-
-  // Offscreen?
-  // If parent or grandparent menuitem is offscreen, then we're offscreen too
-  // We get it by replacing the current offscreen bit with the parent's
-  PRUint32 parentState = 0;
-  nsCOMPtr<nsIAccessible> parentAccessible;
-  GetAccParent(getter_AddRefs(parentAccessible));
-  parentAccessible->GetAccState(&parentState);
-  *_retval &= ~STATE_OFFSCREEN;  // clear the old OFFSCREEN bit
-  *_retval |= (parentState & STATE_OFFSCREEN);  // or it with the parent's offscreen bit
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenuitemAccessible::GetAccName(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No DOM element for menu  node!");
-  element->GetAttribute(NS_LITERAL_STRING("label"), _retval); 
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsXULMenuitemAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_MENUITEM;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenuitemAccessible::GetAccFirstChild(nsIAccessible **aAccFirstChild)
-{
-  *aAccFirstChild = nsnull;
-
-  // Last argument of PR_FALSE indicates we don't walk anonymous children for menuitems
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_FALSE);
-  if (NS_SUCCEEDED(walker.GetFirstChild())) {
-    *aAccFirstChild = walker.mState.accessible;
-    NS_ADDREF(*aAccFirstChild);
-  }
-
-  return NS_OK;  
-}
-
-NS_IMETHODIMP nsXULMenuitemAccessible::GetAccLastChild(nsIAccessible **aAccLastChild)
-{
-  *aAccLastChild = nsnull;
-
-  // Last argument of PR_FALSE indicates we don't walk anonymous children for menuitems
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_FALSE);
-  if (NS_SUCCEEDED(walker.GetLastChild())) {
-    *aAccLastChild = walker.mState.accessible;
-    NS_ADDREF(*aAccLastChild);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenuitemAccessible::GetAccChildCount(PRInt32 *aAccChildCount)
-{
-  // Last argument of PR_FALSE indicates we don't walk anonymous children for menuitems
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_FALSE);
-  *aAccChildCount = walker.GetChildCount();
-
-  return NS_OK;  
-}
-
-// ------------------------ Menu Separator ----------------------------
-
-nsXULMenuSeparatorAccessible::nsXULMenuSeparatorAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell): 
-nsXULMenuitemAccessible(aDOMNode, aShell)
-{ 
-}
-
-NS_IMETHODIMP nsXULMenuSeparatorAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Isn't focusable, but can be offscreen
-  nsXULMenuitemAccessible::GetAccState(_retval);
-  *_retval &= STATE_OFFSCREEN;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenuSeparatorAccessible::GetAccName(nsAString& _retval)
-{
-  _retval.Assign(NS_LITERAL_STRING(""));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenuSeparatorAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_SEPARATOR;
-  return NS_OK;
-}
-
-// ------------------------ Menu Popup -----------------------------
-
-nsXULMenupopupAccessible::nsXULMenupopupAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell): nsAccessible(aDOMNode, aShell)
-{ 
-}
-
-NS_IMETHODIMP nsXULMenupopupAccessible::GetAccState(PRUint32 *_retval)
-{
-  // We are onscreen if our parent is active
-  *_retval = 0;
-  PRBool isActive = PR_FALSE;
-
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  element->HasAttribute(NS_LITERAL_STRING("menuactive"), &isActive);
-  if (!isActive) {
-    nsCOMPtr<nsIAccessible> parentAccessible;
-    nsCOMPtr<nsIDOMNode> parentNode;
-    GetAccParent(getter_AddRefs(parentAccessible));
-    if (parentAccessible)
-      parentAccessible->AccGetDOMNode(getter_AddRefs(parentNode));
-    element = do_QueryInterface(parentNode);
-    if (element)
-      element->HasAttribute(NS_LITERAL_STRING("open"), &isActive);
-  }
-
-  if (!isActive)
-    *_retval |= STATE_OFFSCREEN;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenupopupAccessible::GetAccName(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No element for popup node!");
-
-  while (element) {
-    element->GetAttribute(NS_LITERAL_STRING("label"), _retval);
-    if (!_retval.IsEmpty())
-      return NS_OK;
-    nsCOMPtr<nsIDOMNode> parentNode, node(do_QueryInterface(element));
-    if (!node)
-      return NS_ERROR_FAILURE;
-    node->GetParentNode(getter_AddRefs(parentNode));
-    element = do_QueryInterface(parentNode);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsXULMenupopupAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_MENUPOPUP;
-  return NS_OK;
-}
-
-// ------------------------ Menu Bar -----------------------------
-
-nsXULMenubarAccessible::nsXULMenubarAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell): nsAccessible(aDOMNode, aShell)
-{ 
-}
-
-NS_IMETHODIMP nsXULMenubarAccessible::GetAccState(PRUint32 *_retval)
-{
-  return nsAccessible::GetAccState(_retval);
-}
-
-
-NS_IMETHODIMP nsXULMenubarAccessible::GetAccName(nsAString& _retval)
-{
-  _retval = NS_LITERAL_STRING("menubar");
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsXULMenubarAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_MENUBAR;
-  return NS_OK;
-}
-

mozilla/accessible/src/xul/nsXULMenuAccessible.h

@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: Aaron Leventhal (aaronl@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef _nsXULMenuAccessible_H_
-#define _nsXULMenuAccessible_H_
-
-#include "nsAccessible.h"
-
-/* Accessible for supporting XUL menus
- */
-
-class nsXULMenuitemAccessible : public nsAccessible
-{
-public:
-  nsXULMenuitemAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **aAccFirstChild);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **aAccLastChild);
-  NS_IMETHOD GetAccChildCount(PRInt32 *aAccChildCount);
-};
-
-class nsXULMenuSeparatorAccessible : public nsXULMenuitemAccessible
-{
-public:
-  nsXULMenuSeparatorAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-class nsXULMenupopupAccessible : public nsAccessible
-{
-public:
-  nsXULMenupopupAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-class nsXULMenubarAccessible : public nsAccessible
-{
-public:
-  nsXULMenubarAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-#endif  

mozilla/accessible/src/xul/nsXULSelectAccessible.cpp

@@ -1,360 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- *
- *
- * 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 "nsXULSelectAccessible.h"
-#include "nsIAccessibilityService.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsIDOMNodeList.h"
-#include "nsIDOMXULMultSelectCntrlEl.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsIServiceManager.h"
-#include "nsLayoutAtoms.h"
-
-/**
-  * Selects, Listboxes and Comboboxes, are made up of a number of different
-  *  widgets, some of which are shared between the two. This file contains 
-  *  all of the widgets for both of the Selects, for XUL only. Some of them
-  *  extend classes from nsSelectAccessible.cpp, which contains base classes 
-  *  that are also extended by the XUL Select Accessibility support.
-  *
-  *  Listbox:
-  *     - nsXULListboxAccessible
-  *        - nsXULSelectListAccessible
-  *           - nsXULSelectOptionAccessible
-  *
-  *  Comboboxes:
-  *     - nsXULComboboxAccessible
-  *        - nsHTMLTextFieldAccessible (editable) or nsTextAccessible (readonly)
-  *        - nsXULComboboxButtonAccessible
-  *         - nsXULSelectListAccessible
-  *            - nsXULSelectOptionAccessible
-  */
-
-/** ------------------------------------------------------ */
-/**  First, the common widgets                             */
-/** ------------------------------------------------------ */
-
-/** ----- nsXULSelectListAccessible ----- */
-
-/** Default Constructor */
-nsXULSelectListAccessible::nsXULSelectListAccessible(nsIDOMNode* aDOMNode, 
-                                                     nsIWeakReference* aShell)
-:nsAccessible(aDOMNode, aShell)
-{
-}
-
-NS_IMETHODIMP nsXULSelectListAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LIST;
-  return NS_OK;
-}
-
-/**
-  * As a nsXULSelectListAccessible we can have the following states:
-  *     STATE_MULTISELECTABLE
-  *     STATE_EXTSELECTABLE
-  */
-NS_IMETHODIMP nsXULSelectListAccessible::GetAccState(PRUint32 *_retval)
-{ 
-  *_retval = 0;
-  nsAutoString selectionTypeString;
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No nsIDOMElement for caption node!");
-  element->GetAttribute(NS_LITERAL_STRING("seltype"), selectionTypeString) ;
-  if (selectionTypeString.EqualsIgnoreCase("multiple"))
-    *_retval |= STATE_MULTISELECTABLE | STATE_EXTSELECTABLE;
-
-  return NS_OK;
-}
-
-/** ----- nsXULSelectOptionAccessible ----- */
-
-/** Default Constructor */
-nsXULSelectOptionAccessible::nsXULSelectOptionAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsXULMenuitemAccessible(aDOMNode, aShell)
-{
-}
-
-NS_IMETHODIMP nsXULSelectOptionAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LISTITEM;
-  return NS_OK;
-}
-
-/**
-  * As a nsXULSelectOptionAccessible we can have the following states:
-  *     STATE_SELECTABLE
-  *     STATE_SELECTED
-  *     STATE_FOCUSED
-  *     STATE_FOCUSABLE
-  */
-NS_IMETHODIMP nsXULSelectOptionAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsXULMenuitemAccessible::GetAccState(_retval);
-
-  nsCOMPtr<nsIDOMXULSelectControlItemElement> item(do_QueryInterface(mDOMNode));
-  PRBool isSelected = PR_FALSE;
-  item->GetSelected(&isSelected);
-  if (isSelected)
-    *_retval |= STATE_SELECTED;
-
-  return NS_OK;
-}
-
-/** ------------------------------------------------------ */
-/**  Secondly, the Listbox widget                          */
-/** ------------------------------------------------------ */
-
-/** ----- nsXULListboxAccessible ----- */
-
-/** Constructor */
-nsXULListboxAccessible::nsXULListboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsListboxAccessible(aDOMNode, aShell)
-{
-}
-
-/** Inherit the ISupports impl from nsAccessible, we handle nsIAccessibleSelectable */
-NS_IMPL_ISUPPORTS_INHERITED1(nsXULListboxAccessible, nsListboxAccessible, nsIAccessibleSelectable)
-
-/**
-  * Let Accessible count them up
-  */
-NS_IMETHODIMP nsXULListboxAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  return nsAccessible::GetAccChildCount(_retval);
-}
-
-/**
-  * As a nsXULListboxAccessible we can have the following states:
-  *     STATE_FOCUSED
-  *     STATE_READONLY
-  *     STATE_FOCUSABLE
-  */
-NS_IMETHODIMP nsXULListboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // Get focus status from base class
-  nsListboxAccessible::GetAccState(_retval);
-
-// see if we are multiple select if so set ourselves as such
-  nsCOMPtr<nsIDOMElement> element (do_QueryInterface(mDOMNode));
-  if (element) {
-    nsAutoString selType;
-    element->GetAttribute(NS_LITERAL_STRING("seltype"), selType);
-    if (!selType.IsEmpty() && selType.Equals(NS_LITERAL_STRING("multiple")))
-        *_retval |= STATE_MULTISELECTABLE;
-  }
-
-  *_retval |= STATE_FOCUSABLE ;
-
-  return NS_OK;
-}
-
-/**
-  * Our value is the value of our ( first ) selected child. nsIDOMXULSelectElement
-  *     returns this by default with GetValue().
-  */
-NS_IMETHODIMP nsXULListboxAccessible::GetAccValue(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMXULSelectControlElement> select(do_QueryInterface(mDOMNode));
-  if (select) {
-    nsCOMPtr<nsIDOMXULSelectControlItemElement> selectedItem;
-    select->GetSelectedItem(getter_AddRefs(selectedItem));
-    return selectedItem->GetValue(_retval);
-  }
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsXULListboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LIST;
-  return NS_OK;
-}
-
-/**
-  * nsIAccessibleSelectable method. 
-  *   - gets from the Select DOMNode the list of all Select Options
-  *   - iterates through all of the options looking for selected Options
-  *   - creates IAccessible objects for selected Options
-  *   - Returns the IAccessibles for selected Options in the nsISupportsArray
-  *
-  * retval will be nsnull if:
-  *   - there are no Options in the Select Element
-  *   - there are Options but none are selected
-  *   - the DOMNode is not a nsIDOMXULSelectControlElement ( shouldn't happen )
-  */
-NS_IMETHODIMP nsXULListboxAccessible::GetSelectedChildren(nsISupportsArray **_retval)
-{
-  *_retval = nsnull;
-
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  nsCOMPtr<nsISupportsArray> selectedAccessibles;
-  NS_NewISupportsArray(getter_AddRefs(selectedAccessibles));
-  if (!selectedAccessibles || !accService)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIDOMNodeList> selectedItems;
-  nsCOMPtr<nsIDOMXULMultiSelectControlElement> listbox (do_QueryInterface(mDOMNode));
-  PRInt32 length = 0;
-  if (listbox) {
-    listbox->GetSelectedCount(&length);
-    for ( PRInt32 i = 0 ; i < length ; i++ ) {
-      nsCOMPtr<nsIAccessible> tempAccessible;
-      nsCOMPtr<nsIDOMXULSelectControlItemElement> tempNode;
-      listbox->GetSelectedItem(i, getter_AddRefs(tempNode));
-      nsCOMPtr<nsIDOMNode> tempDOMNode (do_QueryInterface(tempNode));
-      accService->CreateXULListitemAccessible(tempDOMNode, getter_AddRefs(tempAccessible));
-      if (tempAccessible)
-        selectedAccessibles->AppendElement(tempAccessible);
-    }
-  }
-
-  PRUint32 uLength = 0;
-  selectedAccessibles->Count(&uLength); 
-  if ( uLength != 0 ) { // length of nsISupportsArray containing selected options
-    *_retval = selectedAccessibles;
-    NS_ADDREF(*_retval);
-  }
-
-  // no options, not a select or none of the options are selected
-  return NS_OK;
-}
-
-/** ----- nsXULListitemAccessible ----- */
-
-/** Constructor */
-nsXULListitemAccessible::nsXULListitemAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsXULMenuitemAccessible(aDOMNode, aShell)
-{
-}
-
-/** Inherit the ISupports impl from nsAccessible, we handle nsIAccessibleSelectable */
-NS_IMPL_ISUPPORTS_INHERITED0(nsXULListitemAccessible, nsXULMenuitemAccessible)
-
-/**
-  * If there is a Listcell as a child ( not anonymous ) use it, otherwise
-  *   default to getting the name from GetXULAccName
-  */
-NS_IMETHODIMP nsXULListitemAccessible::GetAccName(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMNode> child;
-  if (NS_SUCCEEDED(mDOMNode->GetFirstChild(getter_AddRefs(child)))) {
-    nsCOMPtr<nsIDOMElement> childElement (do_QueryInterface(child));
-    if (childElement) {
-      nsAutoString tagName;
-      childElement->GetLocalName(tagName);
-      if (tagName.Equals(NS_LITERAL_STRING("listcell"))) {
-        childElement->GetAttribute(NS_LITERAL_STRING("label"), _retval);
-        return NS_OK;
-      }
-    }
-  }
-  return GetXULAccName(_retval);
-}
-
-/**
-  *
-  */
-NS_IMETHODIMP nsXULListitemAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LISTITEM;
-  return NS_OK;
-}
-
-/**
-  *
-  */
-NS_IMETHODIMP nsXULListitemAccessible::GetAccState(PRUint32 *_retval)
-{
-//  nsAccessible::GetAccState(_retval); // get focused state
-
-  nsCOMPtr<nsIDOMXULSelectControlItemElement> listItem (do_QueryInterface(mDOMNode));
-  if (listItem) {
-    PRBool isSelected;
-    listItem->GetSelected(&isSelected);
-    if (isSelected)
-      *_retval |= STATE_SELECTED;
-
-    nsCOMPtr<nsIDOMNode> domParent;
-    mDOMNode->GetParentNode(getter_AddRefs(domParent));
-    nsCOMPtr<nsIDOMXULMultiSelectControlElement> parent(do_QueryInterface(domParent));
-    if (parent) {
-      nsCOMPtr<nsIDOMXULSelectControlItemElement> current;
-      parent->GetCurrentItem(getter_AddRefs(current));
-      if (listItem == current)
-        *_retval |= STATE_FOCUSED;
-    }
-
-  *_retval |= STATE_FOCUSABLE | STATE_SELECTABLE;
-
-  }
-
-
-  return NS_OK;
-}
-
-/** ------------------------------------------------------ */
-/**  Finally, the Combobox widgets                         */
-/** ------------------------------------------------------ */
-
-/** ----- nsXULComboboxAccessible ----- */
-
-/** Constructor */
-nsXULComboboxAccessible::nsXULComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsComboboxAccessible(aDOMNode, aShell)
-{
-}
-
-/**
-  * Our value is the value of our ( first ) selected child. nsIDOMXULSelectElement
-  *     returns this by default with GetValue().
-  */
-NS_IMETHODIMP nsXULComboboxAccessible::GetAccValue(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMXULSelectControlElement> select(do_QueryInterface(mDOMNode));
-  if (select) {
-    nsCOMPtr<nsIDOMXULSelectControlItemElement> selectedItem;
-    select->GetSelectedItem(getter_AddRefs(selectedItem));
-    return selectedItem->GetValue(_retval);
-  }
-  return NS_ERROR_FAILURE;
-}
-
-

mozilla/accessible/src/xul/nsXULSelectAccessible.h

@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- *
- *
- * 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 ***** */
-#ifndef __nsXULSelectAccessible_h__
-#define __nsXULSelectAccessible_h__
-
-#include "nsCOMPtr.h"
-#include "nsIAccessibleSelectable.h"
-#include "nsIDOMNode.h"
-#include "nsIWeakReference.h"
-#include "nsSelectAccessible.h"
-#include "nsXULMenuAccessible.h"
-
-/**
-  * Selects, Listboxes and Comboboxes, are made up of a number of different
-  *  widgets, some of which are shared between the two. This file contains 
-  *  all of the widgets for both of the Selects, for XUL only. Some of them
-  *  extend classes from nsSelectAccessible.cpp, which contains base classes 
-  *  that are also extended by the XUL Select Accessibility support.
-  *
-  *  Listbox:
-  *     - nsXULListboxAccessible
-  *        - nsXULSelectListAccessible
-  *           - nsXULSelectOptionAccessible
-  *
-  *  Comboboxes:
-  *     - nsXULComboboxAccessible      <menulist />
-  *        - nsHTMLTextFieldAccessible
-  *        - nsXULComboboxButtonAccessible    
-  *         - nsXULSelectListAccessible      <menupopup />
-  *            - nsXULSelectOptionAccessible(s)   <menuitem />
-  */
-
-/** ------------------------------------------------------ */
-/**  First, the common widgets                             */
-/** ------------------------------------------------------ */
-
-/*
- * The list that contains all the options in the select.
- */
-class nsXULSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsXULSelectListAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsXULSelectListAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-};
-
-/*
- * Options inside the select, contained within the list
- */
-class nsXULSelectOptionAccessible : public nsXULMenuitemAccessible
-{
-public:
-  
-  nsXULSelectOptionAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsXULSelectOptionAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  static nsresult GetFocusedOptionNode(nsIWeakReference *aPresShell, nsIDOMNode *aListNode, nsCOMPtr<nsIDOMNode>& aFocusedOptionNode);
-};
-
-/** ------------------------------------------------------ */
-/**  Secondly, the Listbox widget                          */
-/** ------------------------------------------------------ */
-
-/*
- * A class the represents the XUL Listbox widget.
- */
-class nsXULListboxAccessible : public nsListboxAccessible,
-                               public nsIAccessibleSelectable  
-{
-public:
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLESELECTABLE
-  
-  nsXULListboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsXULListboxAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-
-};
-
-/**
-  * Listitems -- used in listboxes 
-  */
-class nsXULListitemAccessible : public nsXULMenuitemAccessible
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-  
-  nsXULListitemAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsXULListitemAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccName(nsAString& _retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-};
-
-/** ------------------------------------------------------ */
-/**  Finally, the Combobox widgets                         */
-/** ------------------------------------------------------ */
-
-/*
- * A class the represents the XUL Combobox widget.
- */
-class nsXULComboboxAccessible : public nsComboboxAccessible
-{
-public:
-
-  nsXULComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsXULComboboxAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-};
-
-#endif

mozilla/accessible/src/xul/nsXULTabAccessible.cpp

@@ -1,211 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-// NOTE: alphabetically ordered
-#include "nsXULTabAccessible.h"
-#include "nsIDOMXULSelectCntrlEl.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-
-/**
-  * XUL Tab
-  */
-
-/** Constructor */
-nsXULTabAccessible::nsXULTabAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsLeafAccessible(aNode, aShell)
-{ 
-}
-
-/**
-  * Might need to use the GetXULAccName method from nsFormControlAcc.cpp
-  */
-NS_IMETHODIMP nsXULTabAccessible::GetAccName(nsAString& _retval)
-{
-  nsCOMPtr<nsIDOMXULSelectControlItemElement> tab(do_QueryInterface(mDOMNode));
-  if (tab)
-    return GetXULAccName(_retval);
-  return NS_ERROR_FAILURE;
-}
-
-/** Only one action available */
-NS_IMETHODIMP nsXULTabAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  *_retval = eSingle_Action;
-  return NS_OK;
-}
-
-/** Return the name of our only action  */
-NS_IMETHODIMP nsXULTabAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
-{
-  if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("switch"), _retval); 
-    return NS_OK;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/** Tell the tab to do it's action */
-NS_IMETHODIMP nsXULTabAccessible::AccDoAction(PRUint8 index)
-{
-  if (index == eAction_Switch) {
-    nsCOMPtr<nsIDOMXULSelectControlItemElement> tab(do_QueryInterface(mDOMNode));
-    if ( tab )
-    {
-      tab->DoCommand();
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-  }
-  return NS_ERROR_INVALID_ARG;
-}
-
-/** We are a tab */
-NS_IMETHODIMP nsXULTabAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PAGETAB;
-  return NS_OK;
-}
-
-/**
-  * Possible states: focused, focusable, unavailable(disabled), offscreen
-  */
-NS_IMETHODIMP nsXULTabAccessible::GetAccState(PRUint32 *_retval)
-{
-  // get focus and disable status from base class
-  nsLeafAccessible::GetAccState(_retval);
-  *_retval |= STATE_FOCUSABLE;
-  return NS_OK;
-}
-
-/**
-  * XUL TabBox
-  *  to facilitate naming of the tabPanels object we will give this the name
-  *   of the selected tab in the tabs object.
-  */
-
-/** Constructor */
-nsXULTabBoxAccessible::nsXULTabBoxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-/** We are a window*/
-NS_IMETHODIMP nsXULTabBoxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_WINDOW;
-  return NS_OK;
-}
-
-/** Possible states: normal */
-NS_IMETHODIMP nsXULTabBoxAccessible::GetAccState(PRUint32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-
-/** 2 children, tabs, tabpanels */
-NS_IMETHODIMP nsXULTabBoxAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 2;
-  return NS_OK;
-}
-
-/**
-  * XUL TabPanels
-  *  XXX jgaunt -- this has to report the info for the selected child, reachable through
-  *                the DOMNode. The TabPanels object has as its children the different
-  *                vbox/hbox/whatevers that provide what you look at when you click on
-  *                a tab.
-  * Here is how this will work: when asked about an object the tabPanels object will find
-  *  out the selected child and create the tabPanel object using the child. That should wrap
-  *  any XUL/HTML content in the child, since it is a simple nsAccessible basically.
-  * or maybe we just do that on creation. Not use the DOMnode we are given, but cache the selected
-  *  DOMnode and then run from there.
-  */
-
-/** Constructor */
-nsXULTabPanelsAccessible::nsXULTabPanelsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsAccessible(aNode, aShell)
-{ 
-}
-
-/** We are a Property Page */
-NS_IMETHODIMP nsXULTabPanelsAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PROPERTYPAGE;
-  return NS_OK;
-}
-
-/**
-  * Possible values: focused, focusable, unavailable
-  */
-NS_IMETHODIMP nsXULTabPanelsAccessible::GetAccState(PRUint32 *_retval)
-{
-  // get focus and disable status from base class -- skip container because we have state
-  nsAccessible::GetAccState(_retval);
-  *_retval |= STATE_FOCUSABLE;
-  return NS_OK;
-}
-
-/** 
-  * The name for the panel is the name from the tab associated with
-  *  the panel. XXX not sure if the "panels" object should have the
-  *  same name.
-  */
-NS_IMETHODIMP nsXULTabPanelsAccessible::GetAccName(nsAString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/**
-  * XUL Tabs - the s really stands for strip. this is a collection of tab objects
-  */
-
-/** Constructor */
-nsXULTabsAccessible::nsXULTabsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsContainerAccessible(aNode, aShell)
-{ 
-}
-
-/** We are a Page Tab List */
-NS_IMETHODIMP nsXULTabsAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PAGETABLIST;
-  return NS_OK;
-}

mozilla/accessible/src/xul/nsXULTabAccessible.h

@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- * Author: John Gaunt (jgaunt@netscape.com)
- *
- *
- * 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 ***** */
-
-#ifndef _nsXULTabAccessible_H_
-#define _nsXULTabAccessible_H_
-
-// NOTE: alphabetically ordered
-#include "nsBaseWidgetAccessible.h"
-#include "nsFormControlAccessible.h"
-#include "nsHTMLFormControlAccessible.h"
-
-/** An individual tab */
-class nsXULTabAccessible : public nsLeafAccessible
-{
-public:
-  nsXULTabAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-/** 
-  * Contains a tabs object and a tabPanels object. A complete
-  *    entity with relationships between tabs and content to
-  *    be displayed in the tabpanels object
-  */
-class nsXULTabBoxAccessible : public nsAccessible
-{
-public:
-  nsXULTabBoxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-/** 
-  * Represents the content area associated with the tabs object (when
-  *   used together)
-  */
-class nsXULTabPanelsAccessible : public nsAccessible
-{
-public:
-  nsXULTabPanelsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-protected:
-  nsCOMPtr<nsIDOMNode> mGParentDOMNode;
-  nsCOMPtr<nsIDOMNode> mParentDOMNode;
-};
-
-/** merely a container of tab obejcts */
-class nsXULTabsAccessible : public nsContainerAccessible
-{
-public:
-  nsXULTabsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-};
-
-#endif