when doing new card or new list, and a list is selected, we need to reflight

the pickers with the directory that contains the list.
also, remove the xul changes that are for sorting the items in the pickers.
this is not ready for primetime yet, we'll leave them in the same order
as the directory pane.


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

mozilla/Makefile.in

@@ -40,55 +40,14 @@ else
 # Divide the default build into tiers. 
 # Tiers must be defined on module boundaries 
 #
-default: $(SUBMAKEFILES)
-	$(MAKE) tier_0
+default: 
 	$(MAKE) nspr
-	$(MAKE) ldap
-ifdef MOZ_ENABLE_XFT
-	$(MAKE) freetype
-	$(MAKE) expat
-endif
+	$(MAKE) tier_0
 	$(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)
+DIRS = $(NSPRPUB_DIR) $(tier_0_dirs) $(tier_1_dirs) $(tier_9_dirs)
 
 #
 # tier 0 - base build config dirs
@@ -105,14 +64,10 @@ tier_0_dirs = \
 tier_1_dirs = js
 
 # MacOSX needs to build lib for MoreFiles before xpcom
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 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 += \
@@ -126,8 +81,8 @@ ifndef MOZ_NATIVE_ZLIB
 tier_9_dirs	+= modules/zlib
 endif
 
-# Installer needs standalone libjar, hence standalone zlib
-ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
+# Linux and Solaris installer needs standalone libjar, hence standalone zlib
+ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
 tier_9_dirs	+= modules/zlib/standalone
 endif
 
@@ -135,6 +90,9 @@ tier_9_dirs	+= \
 	modules/libjar \
 	$(NULL)
 
+#
+# tier 9 - mozilla application
+#
 ifdef MOZ_JAVA_SUPPLEMENT
 tier_9_dirs += 			\
   java/util			\
@@ -156,10 +114,6 @@ ifdef MOZ_JSDEBUGGER
 tier_9_dirs	+= js/jsd
 endif
 
-ifdef MOZ_ENABLE_XFT
-tier_9_dirs	+= other-licenses/Xft
-endif
-
 ifdef MOZ_ENABLE_XLIB
 tier_9_dirs	+= gfx/src/xlibrgb widget/src/xlibxtbin
 endif
@@ -168,11 +122,8 @@ ifdef MOZ_ENABLE_GTK
 tier_9_dirs	+= widget/src/gtksuperwin widget/src/gtkxtbin
 endif
 
-ifdef MOZ_INTERNAL_LIBART_LGPL
-tier_9_dirs	+= other-licenses/libart_lgpl
-endif
-
 tier_9_dirs	+= \
+		widget/timer \
 		modules/libutil \
 		netwerk \
 		modules/mpfilelocprovider \
@@ -207,10 +158,6 @@ ifdef ACCESSIBILITY
 tier_9_dirs    += accessible
 endif
 
-ifdef MOZ_LDAP_XPCOM
-tier_9_dirs	+= directory/xpcom
-endif
-
 # This must preceed xpfe
 ifdef MOZ_JPROF
 tier_9_dirs        += tools/jprof
@@ -218,6 +165,26 @@ endif
 
 tier_9_dirs	+= xpfe xpinstall
 
+ifdef MOZ_PSM
+tier_9_dirs	+= security/manager
+endif
+
+ifdef MOZ_LDAP_XPCOM
+tier_9_dirs	+= directory/c-sdk/ldap directory/xpcom
+endif
+
+ifdef MOZ_EXTENSIONS
+tier_9_dirs	+= extensions
+endif
+
+ifdef MOZ_MAIL_NEWS
+tier_9_dirs	+= mailnews
+endif
+
+ifdef MOZ_CALENDAR
+tier_9_dirs	+= calendar
+endif
+
 ifdef MOZ_LEAKY
 tier_9_dirs        += tools/leaky
 endif
@@ -232,43 +199,15 @@ endif
 
 tier_9_dirs	+= l10n
 
-#
-# tier 9x - application features
-#
-
-ifdef MOZ_EXTENSIONS
-tier_94_dirs	+= extensions
-endif
-
-ifdef MOZ_PSM
-tier_95_dirs	+= security/manager
-endif
-
-ifdef MOZ_MAIL_NEWS
-tier_97_dirs	+= mailnews
-endif
-
-ifdef MOZ_CALENDAR
-tier_98_dirs	+= calendar
-endif
-
-#
-# tier 99 - application binaries
-#
-
 ifneq (,$(MOZ_STATIC_COMPONENTS)$(MOZ_META_COMPONENTS))
-tier_99_dirs   += modules/staticmod
+tier_9_dirs   += modules/staticmod
 endif
 
-tier_99_dirs	+= xpfe/bootstrap
-
-ifdef MOZ_ENABLE_GTK
-tier_99_dirs	+= embedding/browser/gtk/tests
-endif
+tier_9_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,52 +219,18 @@ 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
+	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 install; \
+	done
 #
 # Individual modules
 #
@@ -335,27 +240,8 @@ ifdef GC_LEAK_DETECTOR
 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
+ifdef NSPRPUB_DIR
+	$(MAKE) -C $(NSPRPUB_DIR)
 endif
 
 # For modules.mk standalone build
@@ -369,31 +255,4 @@ 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,15 +29,12 @@ 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 \
+REQUIRES	= xpcom \
+		  string \
+		  dom \
 		  $(NULL)
 
 CPPSRCS		= nsAccessibilityFactory.cpp
@@ -45,23 +42,18 @@ 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,34 @@
 # 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)
+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

@@ -63,7 +63,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

@@ -39,5 +39,8 @@ XPIDLSRCS = \
       nsIAccessibleProvider.idl \
       $(NULL)
 
+EXPORTS = \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
 

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -33,55 +33,27 @@ 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 createHTMLIFrameAccessible(in nsIDOMNode aNode, in nsISupports aPresContext);
+  nsIAccessible createHTMLBlockAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
   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 createAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
   nsIAccessible getAccessibleFor(in nsIDOMNode aNode);
 };
 

mozilla/accessible/public/nsIAccessible.idl

@@ -189,5 +189,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/src/MANIFEST

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

mozilla/accessible/src/Makefile.in

@@ -16,24 +16,65 @@
 # 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 \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  dom \
+		  view \
+		  locale \
+		  intl \
+		  docshell \
+		  webshell \
+		  necko \
+		  htmlparser \
+		  xuldoc \
+		  imglib2 \
+		  gfx2 \
+		  uriloader \
+		  timer \
+		  $(NULL)
 
-ifdef MOZ_XUL
-DIRS +=   xul
-endif
+CPPSRCS   = \
+    nsAccessible.cpp \
+    nsAccessibilityService.cpp \
+    nsBaseWidgetAccessible.cpp \
+    nsFormControlAccessible.cpp \
+    nsGenericAccessible.cpp \
+    nsHTMLAreaAccessible.cpp \
+    nsHTMLFormControlAccessible.cpp \
+    nsHTMLIFrameRootAccessible.cpp \
+    nsHTMLImageAccessible.cpp \
+    nsHTMLLinkAccessible.cpp \
+    nsHTMLSelectAccessible.cpp \
+    nsHTMLTableAccessible.cpp \
+    nsHTMLTextAccessible.cpp \
+    nsRootAccessible.cpp \
+    nsSelectAccessible.cpp \
+    nsXULFormControlAccessible.cpp \
+    nsXULTextAccessible.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

@@ -19,8 +19,9 @@
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
  *
+ * Contributor(s):
  * 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
@@ -51,19 +52,23 @@ 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);
+  NS_IMETHOD GetShellFromNode(nsIDOMNode *aNode, nsIWeakReference **weakShell);
   void GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent);
   nsIContent* FindContentForDocShell(nsIPresShell* aPresShell, nsIContent* aContent, nsIDocShell*  aDocShell);
+
 };
 
 #endif /* __nsIAccessibilityService_h__ */

mozilla/accessible/src/base/nsAccessible.cpp

@@ -21,7 +21,6 @@
  *
  * 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
@@ -49,9 +48,6 @@
 #include "nsIScrollableView.h"
 #include "nsIViewManager.h"
 #include "nsIWidget.h"
-#include "nsIDOMDocumentView.h"
-#include "nsIDOMAbstractView.h"
-#include "nsIDOMWindowInternal.h"
 #include "nsRootAccessible.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMElement.h"
@@ -119,7 +115,53 @@ static gnsAccessibles = 0;
 
 static NS_DEFINE_CID(kStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
 
-nsAccessibleTreeWalker::nsAccessibleTreeWalker(nsIWeakReference* aPresShell, nsIDOMNode* aNode, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList, PRBool aWalkAnonContent): 
+
+
+/** 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 {
+public:
+  nsAccessibleTreeWalker(nsIWeakReference* aShell, nsIDOMNode* aContent, 
+    PRInt32 aCachedSiblingIndex, nsIDOMNodeList *aCachedSiblingList);
+  ~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 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;
+};
+
+nsAccessibleTreeWalker::nsAccessibleTreeWalker(nsIWeakReference* aPresShell, nsIDOMNode* aNode, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList): 
   mPresShell(aPresShell), mAccService(do_GetService("@mozilla.org/accessibilityService;1"))
 {
   mState.domNode = aNode;
@@ -127,18 +169,15 @@ nsAccessibleTreeWalker::nsAccessibleTreeWalker(nsIWeakReference* aPresShell, nsI
   mState.prevState = nsnull;
   mState.siblingList = aSiblingList;
 
-  if (mState.siblingIndex < 0)
-    mState.siblingList = nsnull;
+  NS_ASSERTION((aSiblingIndex >= 0) == (aSiblingList != nsnull), "Cached sibling list and sibling index not in sync.");
 
-  if (aWalkAnonContent) {
-    nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-    if (shell) {
-      nsCOMPtr<nsIDocument> doc;
-      shell->GetDocument(getter_AddRefs(doc)); 
-      doc->GetBindingManager(getter_AddRefs(mBindingManager));
-    }
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (shell) {
+    nsCOMPtr<nsIDocument> doc;
+    shell->GetDocument(getter_AddRefs(doc)); 
+    doc->GetBindingManager(getter_AddRefs(mBindingManager));
   }
-  MOZ_COUNT_CTOR(nsAccessibleTreeWalker);
+   MOZ_COUNT_CTOR(nsAccessibleTreeWalker);
 }
 
 nsAccessibleTreeWalker::~nsAccessibleTreeWalker()
@@ -251,7 +290,7 @@ NS_IMETHODIMP nsAccessibleTreeWalker::PushState()
   // Duplicate mState and put right before end; reset mState; make mState the new end of the stack
   WalkState* nextToLastState= new WalkState();
   if (!nextToLastState)
-    return NS_ERROR_OUT_OF_MEMORY;
+    return NS_ERROR_FAILURE;
   *nextToLastState = mState;  // Deep copy - copy contents of struct to new state that will be added to end of our stack
   ClearState();
   mState.prevState = nextToLastState;   // Link to previous state
@@ -292,9 +331,6 @@ NS_IMETHODIMP nsAccessibleTreeWalker::GetNextSibling()
     else {
       // if next is accessible, use it 
       mState.domNode = next;
-      if (IsHidden())
-        continue;
-
       if (GetAccessible())
         return NS_OK;
 
@@ -310,19 +346,6 @@ NS_IMETHODIMP nsAccessibleTreeWalker::GetNextSibling()
   return NS_ERROR_FAILURE;
 }
 
-PRBool nsAccessibleTreeWalker::IsHidden()
-{
-  PRBool isHidden = PR_FALSE;
-
-  nsCOMPtr<nsIDOMXULElement> xulElt(do_QueryInterface(mState.domNode));
-  if (xulElt) {
-    xulElt->GetHidden(&isHidden);
-    if (!isHidden)
-      xulElt->GetCollapsed(&isHidden);
-  }
-  return isHidden;
-}
-
 NS_IMETHODIMP nsAccessibleTreeWalker::GetFirstChild()
 {
   if (!mState.domNode)
@@ -342,7 +365,7 @@ NS_IMETHODIMP nsAccessibleTreeWalker::GetFirstChild()
   // Recursive loop: depth first search for first accessible child
   while (next) {
     mState.domNode = next;
-    if (!IsHidden() && (GetAccessible() || NS_SUCCEEDED(GetFirstChild())))
+    if (GetAccessible() || NS_SUCCEEDED(GetFirstChild()))
       return NS_OK;
     if (mState.siblingIndex == eSiblingsWalkNormalDOM)  // Indicates we must use normal DOM calls to traverse here
       mState.domNode->GetNextSibling(getter_AddRefs(next));
@@ -364,7 +387,7 @@ NS_IMETHODIMP nsAccessibleTreeWalker::GetChildBefore(nsIDOMNode* aParent, nsIDOM
   nsCOMPtr<nsIDOMNode> prevDOMNode(mState.domNode);
   nsCOMPtr<nsIAccessible> prevAccessible(mState.accessible);
 
-  while (mState.domNode && NS_SUCCEEDED(GetNextSibling()) && mState.domNode != aChild) {
+  while (mState.domNode && NS_SUCCEEDED(GetNextSibling()) && mState.domNode == aChild) {
     prevDOMNode = mState.domNode;
     prevAccessible = mState.accessible;
   }
@@ -464,7 +487,7 @@ nsAccessible::~nsAccessible()
 }
 
 
-NS_IMETHODIMP nsAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
   if (elt) 
@@ -476,9 +499,8 @@ NS_IMETHODIMP nsAccessible::CacheOptimizations(nsIAccessible *aParent, PRInt32 a
 {
   if (aParent)
     mParent = aParent;
-  if (aSiblingList) 
-    mSiblingList = aSiblingList;
   mSiblingIndex = aSiblingIndex;
+  mSiblingList = aSiblingList;
   return NS_OK;
 }
 
@@ -491,8 +513,7 @@ NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible **  aAccParent)
   }
 
   *aAccParent = nsnull;
-  // Last argument of PR_TRUE indicates to walk anonymous content
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_TRUE); 
+  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList); 
   if (NS_SUCCEEDED(walker.GetParent())) {
     *aAccParent = mParent = walker.mState.accessible;
     NS_ADDREF(*aAccParent);
@@ -506,8 +527,7 @@ NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling)
 { 
   *aAccNextSibling = nsnull;
 
-  // Last argument of PR_TRUE indicates to walk anonymous content
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_TRUE);
+  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList);
 
   if (NS_SUCCEEDED(walker.GetNextSibling())) {
     *aAccNextSibling = walker.mState.accessible;
@@ -524,8 +544,7 @@ NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousS
 {  
   *aAccPreviousSibling = nsnull;
 
-  // Last argument of PR_TRUE indicates to walk anonymous content
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_TRUE);
+  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList);
   if (NS_SUCCEEDED(walker.GetPreviousSibling())) {
     *aAccPreviousSibling = walker.mState.accessible;
     NS_ADDREF(*aAccPreviousSibling);
@@ -541,7 +560,7 @@ NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild)
 {  
   *aAccFirstChild = nsnull;
 
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_TRUE);
+  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList);
   if (NS_SUCCEEDED(walker.GetFirstChild())) {
     *aAccFirstChild = walker.mState.accessible;
     NS_ADDREF(*aAccFirstChild);
@@ -556,7 +575,7 @@ NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
 {  
   *aAccLastChild = nsnull;
 
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_TRUE);
+  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList);
   if (NS_SUCCEEDED(walker.GetLastChild())) {
     *aAccLastChild = walker.mState.accessible;
     NS_ADDREF(*aAccLastChild);
@@ -569,13 +588,13 @@ NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
 /* readonly attribute long accChildCount; */
 NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
 {
-  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList, PR_TRUE);
+  nsAccessibleTreeWalker walker(mPresShell, mDOMNode, mSiblingIndex, mSiblingList);
   *aAccChildCount = walker.GetChildCount();
 
   return NS_OK;  
 }
 
-nsresult nsAccessible::GetTranslatedString(const nsAString& aKey, nsAString& aStringOut)
+nsresult nsAccessible::GetTranslatedString(PRUnichar *aKey, nsAWritableString *aStringOut)
 {
   static nsCOMPtr<nsIStringBundle> stringBundle;
   static PRBool firstTime = PR_TRUE;
@@ -585,6 +604,7 @@ nsresult nsAccessible::GetTranslatedString(const nsAString& aKey, nsAString& aSt
     nsresult rv;
     nsCOMPtr<nsIStringBundleService> stringBundleService = 
              do_GetService(kStringBundleServiceCID, &rv);
+    // nsCOMPtr<nsIStringBundleService> stringBundleService(do_GetService(kStringBundleServiceCID, &rv));
     if (!stringBundleService) { 
       NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n");
       return NS_ERROR_FAILURE;
@@ -594,20 +614,15 @@ nsresult nsAccessible::GetTranslatedString(const nsAString& aKey, nsAString& aSt
 
   nsXPIDLString xsValue;
   if (!stringBundle || 
-    NS_FAILED(stringBundle->GetStringFromName(PromiseFlatString(aKey).get(), getter_Copies(xsValue)))) 
+    NS_FAILED(stringBundle->GetStringFromName(aKey, getter_Copies(xsValue)))) 
     return NS_ERROR_FAILURE;
 
-  aStringOut.Assign(xsValue);
+  aStringOut->Assign(xsValue);
   return NS_OK;
 }
 
-PRBool nsAccessible::IsPartiallyVisible() 
+PRBool nsAccessible::IsEntirelyVisible() 
 {
-  // We need to know if at least a kMinPixels around the object is visible
-  // Otherwise it will be marked STATE_OFFSCREEN and STATE_INVISIBLE
-  
-  const PRUint16 kMinPixels  = 12;
-
   // Set up the variables we need, return false if we can't get at them all
   nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
   if (!shell) 
@@ -633,7 +648,7 @@ PRBool nsAccessible::IsPartiallyVisible()
     return PR_FALSE;
 
   // Get the bounds of the current frame, relative to the current view.
-  // We don't use the more accurate AccGetBounds, because that is more expensive 
+  // We don't use the more accurate GetAccBounds, because that is more expensive 
   // and the STATE_OFFSCREEN flag that this is used for only needs to be a rough indicator
   nsRect relFrameRect;
   nsIView *containingView = nsnull;
@@ -648,10 +663,8 @@ PRBool nsAccessible::IsPartiallyVisible()
     relFrameRect.y = frameOffset.y;
   }
 
-  float p2t;
-  presContext->GetPixelsToTwips(&p2t);
   PRBool isVisible = PR_FALSE;
-  viewManager->IsRectVisible(containingView, relFrameRect, NS_STATIC_CAST(PRUint16, (kMinPixels * p2t)), &isVisible);
+  viewManager->IsRectVisible(containingView, relFrameRect, PR_TRUE, &isVisible);
 
   return isVisible;
 }
@@ -692,25 +705,15 @@ NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState)
 
   nsCOMPtr<nsIDOMElement> currElement(do_QueryInterface(mDOMNode));
   if (currElement) {
-    // Set STATE_UNAVAILABLE state based on disabled attribute
-    // The disabled attribute is mostly used in XUL elements and HTML forms, but
-    // if someone sets it on another attribute, 
-    // it seems reasonable to consider it unavailable
-    PRBool isDisabled = PR_FALSE;
-    currElement->HasAttribute(NS_LITERAL_STRING("disabled"), &isDisabled);
-    if (isDisabled)  
-      *aAccState |= STATE_UNAVAILABLE;
-    else { 
-      *aAccState |= STATE_FOCUSABLE;
-      nsCOMPtr<nsIDOMElement> focusedElement;
-      if (NS_SUCCEEDED(GetFocusedElement(getter_AddRefs(focusedElement))) && focusedElement == currElement)
-        *aAccState |= STATE_FOCUSED;
-    }
+    *aAccState |= STATE_FOCUSABLE;
+    nsCOMPtr<nsIDOMElement> focusedElement;
+    if (NS_SUCCEEDED(GetFocusedElement(getter_AddRefs(focusedElement))) && focusedElement == currElement)
+      *aAccState |= STATE_FOCUSED;
   }
 
   // Check if STATE_OFFSCREEN bitflag should be turned on for this object
-  if (!IsPartiallyVisible())
-    *aAccState |= STATE_OFFSCREEN | STATE_INVISIBLE;
+  if (!IsEntirelyVisible())
+    *aAccState |= STATE_OFFSCREEN;
 
   return rv;
 }
@@ -718,68 +721,65 @@ NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState)
   /* readonly attribute boolean accFocused; */
 NS_IMETHODIMP nsAccessible::GetAccFocused(nsIAccessible * *aAccFocused) 
 { 
-  *aAccFocused = nsnull;
-
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-
   nsCOMPtr<nsIDOMElement> focusedElement;
-  if (accService && NS_SUCCEEDED(GetFocusedElement(getter_AddRefs(focusedElement)))) {
-    nsCOMPtr<nsIDOMNode> focusedNode(do_QueryInterface(focusedElement));
-    nsCOMPtr<nsIAccessible> accessible;
-    if (NS_SUCCEEDED(accService->GetAccessibleFor(focusedNode, getter_AddRefs(accessible)))) {
-      *aAccFocused = accessible;
+  nsIFrame *frame = nsnull;
+
+  if (NS_SUCCEEDED(GetFocusedElement(getter_AddRefs(focusedElement)))) {
+    nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+    if (!shell) {
+       *aAccFocused = nsnull;
+       return NS_OK;  
+    }
+
+    nsCOMPtr<nsIContent> content(do_QueryInterface(focusedElement));
+    if (shell && content)
+      shell->GetPrimaryFrameFor(content, &frame);
+  }
+
+  if (frame) {
+    nsCOMPtr<nsIAccessible> acc(do_QueryInterface(frame));
+    if (acc) { 
+      *aAccFocused = acc;
       NS_ADDREF(*aAccFocused);
       return NS_OK;
     }
   }
  
-  return NS_ERROR_FAILURE;  
+  *aAccFocused = nsnull;
+
+  return NS_OK;  
 }
 
   /* nsIAccessible accGetChildAt (in long x, in long y); */
 NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{  
-  PRInt32 x, y, w, h;
+{
+  PRInt32 x,y,w,h;
   AccGetBounds(&x,&y,&w,&h);
-
-  if (tx >= x && tx < x + w && ty >= y && ty < y + h)
+  if (tx > x && tx < x + w && ty > y && ty < y + h)
   {
     nsCOMPtr<nsIAccessible> child;
     nsCOMPtr<nsIAccessible> next;
     GetAccFirstChild(getter_AddRefs(child));
-
     PRInt32 cx,cy,cw,ch;
 
-    while (child) {
-      // First test if offscreen bit is set for menus
-      // We don't want to walk into offscreen menus or menu items
-      PRUint32 role = ROLE_NOTHING, state = 0;
-      child->GetAccRole(&role);
-
-      if (role == ROLE_MENUPOPUP || role == ROLE_MENUITEM || role == ROLE_SEPARATOR) {
-        child->GetAccState(&state);
-        if (role == ROLE_MENUPOPUP && (state&STATE_OFFSCREEN) == 0) {
-          // Skip menupopup layer and go straight to menuitem's
-          return child->AccGetAt(tx, ty, _retval);
-        }
-      }
-
-      if ((state & STATE_OFFSCREEN) == 0) {   // Don't walk into offscreen menu items
-        child->AccGetBounds(&cx,&cy,&cw,&ch);
-        if (tx >= cx && tx < cx + cw && ty >= cy && ty < cy + ch) 
-        {
-          *_retval = child;
-          NS_ADDREF(*_retval);
-          return NS_OK;
-        }
+    while(child) {
+      child->AccGetBounds(&cx,&cy,&cw,&ch);
+      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
+      {
+        *_retval = child;
+        NS_ADDREF(*_retval);
+        return NS_OK;
       }
       child->GetAccNextSibling(getter_AddRefs(next));
       child = next;
     }
+
+    *_retval = this;
+    NS_ADDREF(this);
+    return NS_OK;
   }
 
-  *_retval = this;
-  NS_ADDREF(this);
+  *_retval = nsnull;
   return NS_OK;
 }
 
@@ -790,70 +790,142 @@ NS_IMETHODIMP nsAccessible::AccGetDOMNode(nsIDOMNode **_retval)
     return NS_OK;
 }
 
-void nsAccessible::GetScreenOrigin(nsIPresContext *aPresContext, nsIFrame *aFrame, nsRect *aRect)
-{
-  aRect->x = aRect->y = 0;
-
-  if (aPresContext) {
-    PRInt32 offsetX = 0;
-    PRInt32 offsetY = 0;
-    nsCOMPtr<nsIWidget> widget;
-    
-    while (aFrame) {
-      // Look for a widget so we can get screen coordinates
-      nsIView* view = nsnull;
-      aFrame->GetView(aPresContext, &view);
-      nsPoint origin;
-      if (view) {
-        view->GetWidget(*getter_AddRefs(widget));
-        if (widget)
-          break;
-      }
-      // No widget yet, so count up the coordinates of the frame 
-      aFrame->GetOrigin(origin);
-      offsetX += origin.x;
-      offsetY += origin.y;
   
-      aFrame->GetParent(&aFrame);
-    }
-    
-    if (widget) {
-      // Get the scale from that Presentation Context
-      float t2p;
-      aPresContext->GetTwipsToPixels(&t2p);
-    
-      // Convert to pixels using that scale
-      offsetX = NSTwipsToIntPixels(offsetX, t2p);
-      offsetY = NSTwipsToIntPixels(offsetY, t2p);
-      
-      // Add the widget's screen coordinates to the offset we've counted
-      nsRect oldBox(0,0,0,0);
-      widget->WidgetToScreen(oldBox, *aRect);
-      aRect->x += offsetX;
-      aRect->y += offsetY;
-    }
-  }
+//-------------------------------------------------------
+// This gets ref counted copies of the PresShell, PresContext, 
+// and Root Content for a given nsIDocShell
+nsresult 
+nsAccessible::GetDocShellObjects(nsIDocShell*     aDocShell,
+                                 nsIPresShell**   aPresShell, 
+                                 nsIPresContext** aPresContext, 
+                                 nsIContent**     aContent)
+{
+  NS_ENSURE_ARG_POINTER(aDocShell);
+  NS_ENSURE_ARG_POINTER(aPresShell);
+  NS_ENSURE_ARG_POINTER(aPresContext);
+  NS_ENSURE_ARG_POINTER(aContent);
+
+
+  aDocShell->GetPresShell(aPresShell); // this addrefs
+  if (*aPresShell == nsnull) return NS_ERROR_FAILURE;
+
+  aDocShell->GetPresContext(aPresContext); // this addrefs
+  if (*aPresContext == nsnull) return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIDocument> doc;
+  (*aPresShell)->GetDocument(getter_AddRefs(doc));
+  if (!doc) return NS_ERROR_FAILURE;
+
+  return doc->GetRootContent(aContent); // this addrefs
 }
 
-void nsAccessible::GetScrollOffset(nsRect *aRect)
+//-------------------------------------------------------
+// 
+
+// Calculate a frame's position in screen coordinates
+nsresult
+nsAccessible::GetAbsoluteFramePosition(nsIPresContext* aPresContext,
+                                       nsIFrame *aFrame, 
+                                       nsRect& aAbsoluteTwipsRect, 
+                                       nsRect& aAbsolutePixelRect)
 {
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  if (shell) {
-    nsCOMPtr<nsIDocument> doc;
-    shell->GetDocument(getter_AddRefs(doc));
-    nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(doc));
-    if (!docView) 
-      return;
+  //XXX: This code needs to take the view's offset into account when calculating
+  //the absolute coordinate of the frame.
+  nsresult rv = NS_OK;
+ 
+  aFrame->GetRect(aAbsoluteTwipsRect);
+  // zero these out, 
+  // because the GetOffsetFromView figures them out
+  // We're only keeping the height and width in aAbsoluteTwipsRect
+  aAbsoluteTwipsRect.x = 0;
+  aAbsoluteTwipsRect.y = 0;
 
-    nsCOMPtr<nsIDOMAbstractView> abstractView;
-    docView->GetDefaultView(getter_AddRefs(abstractView));
-    if (!abstractView) 
-      return;
-
-    nsCOMPtr<nsIDOMWindowInternal> window(do_QueryInterface(abstractView));
-    window->GetPageXOffset(&aRect->x);
-    window->GetPageYOffset(&aRect->y);
+    // Get conversions between twips and pixels
+  float t2p;
+  float p2t;
+  aPresContext->GetTwipsToPixels(&t2p);
+  aPresContext->GetPixelsToTwips(&p2t);
+  
+   // Add in frame's offset from it it's containing view
+  nsIView *containingView = nsnull;
+  nsPoint offset(0,0);
+  rv = aFrame->GetOffsetFromView(aPresContext, offset, &containingView);
+  if (containingView == nsnull) {
+    aFrame->GetView(aPresContext, &containingView);
+    nsRect r;
+    aFrame->GetRect(r);
+    offset.x = r.x;
+    offset.y = r.y;
   }
+  if (NS_SUCCEEDED(rv) && (nsnull != containingView)) {
+    aAbsoluteTwipsRect.x += offset.x;
+    aAbsoluteTwipsRect.y += offset.y;
+
+    nsPoint viewOffset;
+    containingView->GetPosition(&viewOffset.x, &viewOffset.y);
+    nsIView * parent;
+    containingView->GetParent(parent);
+
+    // if we don't have a parent view then 
+    // check to see if we have a widget and adjust our offset for the widget
+    if (parent == nsnull) {
+      nsIWidget * widget;
+      containingView->GetWidget(widget);
+      if (nsnull != widget) {
+        // Add in the absolute offset of the widget.
+        nsRect absBounds;
+        nsRect lc;
+        widget->WidgetToScreen(lc, absBounds);
+        // Convert widget coordinates to twips   
+        aAbsoluteTwipsRect.x += NSIntPixelsToTwips(absBounds.x, p2t);
+        aAbsoluteTwipsRect.y += NSIntPixelsToTwips(absBounds.y, p2t);   
+        NS_RELEASE(widget);
+      }
+      rv = NS_OK;
+    } else {
+
+      while (nsnull != parent) {
+        nsPoint po;
+        parent->GetPosition(&po.x, &po.y);
+        viewOffset.x += po.x;
+        viewOffset.y += po.y;
+        nsIScrollableView * scrollView;
+        if (NS_OK == containingView->QueryInterface(NS_GET_IID(nsIScrollableView), (void **)&scrollView)) {
+          nscoord x;
+          nscoord y;
+          scrollView->GetScrollPosition(x, y);
+          viewOffset.x -= x;
+          viewOffset.y -= y;
+        }
+        nsIWidget * widget;
+        parent->GetWidget(widget);
+        if (nsnull != widget) {
+          // Add in the absolute offset of the widget.
+          nsRect absBounds;
+          nsRect lc;
+          widget->WidgetToScreen(lc, absBounds);
+          // Convert widget coordinates to twips   
+          aAbsoluteTwipsRect.x += NSIntPixelsToTwips(absBounds.x, p2t);
+          aAbsoluteTwipsRect.y += NSIntPixelsToTwips(absBounds.y, p2t);   
+          NS_RELEASE(widget);
+          break;
+        }
+        parent->GetParent(parent);
+      }
+      aAbsoluteTwipsRect.x += viewOffset.x;
+      aAbsoluteTwipsRect.y += viewOffset.y;
+    }
+  }
+
+   // convert to pixel coordinates
+  if (NS_SUCCEEDED(rv)) {
+   aAbsolutePixelRect.x = NSTwipsToIntPixels(aAbsoluteTwipsRect.x, t2p);
+   aAbsolutePixelRect.y = NSTwipsToIntPixels(aAbsoluteTwipsRect.y, t2p);
+   aAbsolutePixelRect.width = NSTwipsToIntPixels(aAbsoluteTwipsRect.width, t2p);
+   aAbsolutePixelRect.height = NSTwipsToIntPixels(aAbsoluteTwipsRect.height, t2p);
+  }
+
+  return rv;
 }
 
 
@@ -876,49 +948,45 @@ void nsAccessible::GetBounds(nsRect& aTotalBounds, nsIFrame** aBoundingFrame)
   if (!firstFrame)
     return;
 
-  nsCOMPtr<nsIPresContext> presContext;
-  GetPresContext(presContext);
-
   // Find common relative parent
   // This is an ancestor frame that will incompass all frames for this content node.
   // We need the relative parent so we can get absolute screen coordinates
   nsIFrame *ancestorFrame = firstFrame;
-
   while (ancestorFrame) {  
     *aBoundingFrame = ancestorFrame;
-    // If any other frame type, we only need to deal with the primary frame
-    // Otherwise, there may be more frames attached to the same content node
-    if (!IsCorrectFrameType(ancestorFrame, nsLayoutAtoms::inlineFrame) &&
-        !IsCorrectFrameType(ancestorFrame, nsLayoutAtoms::textFrame))
+    if (IsCorrectFrameType(ancestorFrame, nsLayoutAtoms::blockFrame) || 
+        IsCorrectFrameType(ancestorFrame, nsLayoutAtoms::areaFrame)) {
       break;
+    }
     ancestorFrame->GetParent(&ancestorFrame); 
   }
 
+  // Get ready for loop
+  nsCOMPtr<nsIPresContext> presContext;
+  GetPresContext(presContext);
+
   nsIFrame *iterFrame = firstFrame;
   nsCOMPtr<nsIContent> firstContent(do_QueryInterface(mDOMNode));
   nsCOMPtr<nsIContent> iterContent(firstContent);
+  nsRect currFrameBounds;
   PRInt32 depth = 0;
 
   // Look only at frames below this depth, or at this depth (if we're still on the content node we started with)
   while (iterContent == firstContent || depth > 0) {
     // Coordinates will come back relative to parent frame
     nsIFrame *parentFrame = iterFrame;
-    nsRect currFrameBounds;
     iterFrame->GetRect(currFrameBounds);
-   
-    // We just want the width and height - only get relative coordinates if we're not already
-    // at the bounding frame
-    currFrameBounds.x = currFrameBounds.y = 0;
 
     // Make this frame's bounds relative to common parent frame
-    while (parentFrame && parentFrame != *aBoundingFrame) {
+    while (parentFrame != *aBoundingFrame) {  
+      parentFrame->GetParent(&parentFrame);
+      if (!parentFrame) 
+        break;
       nsRect parentFrameBounds;
       parentFrame->GetRect(parentFrameBounds);
       // Add this frame's bounds to our total rectangle
       currFrameBounds.x += parentFrameBounds.x;
       currFrameBounds.y += parentFrameBounds.y;
-
-      parentFrame->GetParent(&parentFrame);
     }
 
     // Add this frame's bounds to total
@@ -961,6 +1029,7 @@ void nsAccessible::GetBounds(nsRect& aTotalBounds, nsIFrame** aBoundingFrame)
 /* void accGetBounds (out long x, out long y, out long width, out long height); */
 NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
 {
+
   // This routine will get the entire rectange for all the frames in this node
   // -------------------------------------------------------------------------
   //      Primary Frame for node
@@ -975,12 +1044,13 @@ NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width,
     *x = *y = *width = *height = 0;
     return NS_ERROR_FAILURE;
   }
+
   presContext->GetTwipsToPixels(&t2p);   // Get pixels to twips conversion factor
 
   nsRect unionRectTwips;
-  nsIFrame* aBoundingFrame = nsnull;
-  GetBounds(unionRectTwips, &aBoundingFrame);   // Unions up all primary frames for this node and all siblings after it
-  if (!aBoundingFrame) {
+  nsIFrame* aRelativeFrame = nsnull;
+  GetBounds(unionRectTwips, &aRelativeFrame);   // Unions up all primary frames for this node and all siblings after it
+  if (!aRelativeFrame) {
     *x = *y = *width = *height = 0;
     return NS_ERROR_FAILURE;
   }
@@ -993,20 +1063,26 @@ NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width,
   // We have the union of the rectangle, now we need to put it in absolute screen coords
 
   if (presContext) {
-    nsRect orgRectPixels, pageRectPixels;
-    GetScreenOrigin(presContext, aBoundingFrame, &orgRectPixels);
-    nsCOMPtr<nsIAccessibleEventReceiver> accessibleEventReceiver(do_QueryInterface(this));
-    if (!accessibleEventReceiver)        // Only the root accessible object supports this interface
-      GetScrollOffset(&pageRectPixels);  // Don't add scroll offsets for the root accessible
-    *x += orgRectPixels.x - pageRectPixels.x;
-    *y += orgRectPixels.y - pageRectPixels.y;
+    nsRect orgRectTwips, frameRectTwips, orgRectPixels;
+
+    // Get the offset of this frame in screen coordinates
+    if (NS_SUCCEEDED(GetAbsoluteFramePosition(presContext, aRelativeFrame, orgRectTwips, orgRectPixels))) {
+      aRelativeFrame->GetRect(frameRectTwips);   // Usually just the primary frame, but can be the choice list frame for an nsSelectAccessible
+      // Add in the absolute coorinates.
+      // Since these absolute coordinates are for the primary frame, 
+      // also subtract the difference between our primary frame and our bounds frame
+      *x += orgRectPixels.x - NSTwipsToIntPixels(frameRectTwips.x, t2p);
+      *y += orgRectPixels.y - NSTwipsToIntPixels(frameRectTwips.y, t2p);
+    }
   }
 
   return NS_OK;
 }
 
+
 // helpers
 
+
 /**
   * Static
   * Helper method to help sub classes make sure they have the proper
@@ -1140,7 +1216,7 @@ NS_IMETHODIMP nsAccessible::AccTakeFocus()
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAccessible::AppendStringWithSpaces(nsAString *aFlatString, const nsAString& textEquivalent)
+NS_IMETHODIMP nsAccessible::AppendStringWithSpaces(nsAWritableString *aFlatString, nsAReadableString& textEquivalent)
 {
   // Insert spaces to insure that words from controls aren't jammed together
   if (!textEquivalent.IsEmpty()) {
@@ -1160,7 +1236,7 @@ NS_IMETHODIMP nsAccessible::AppendStringWithSpaces(nsAString *aFlatString, const
  * that node's decendants.
  */
 
-NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent, nsAString *aFlatString)
+NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString)
 {
   nsAutoString textEquivalent;
   nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(aContent));
@@ -1241,7 +1317,7 @@ NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent
 }
 
 
-NS_IMETHODIMP nsAccessible::AppendFlatStringFromSubtree(nsIContent *aContent, nsAString *aFlatString)
+NS_IMETHODIMP nsAccessible::AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString)
 {
   // Depth first search for all text nodes that are decendants of content node.
   // Append all the text into one flat string
@@ -1268,7 +1344,7 @@ NS_IMETHODIMP nsAccessible::AppendFlatStringFromSubtree(nsIContent *aContent, ns
   * Checks the label's value first then makes a call to get the 
   *  text from the children if the value is not set.
   */
-NS_IMETHODIMP nsAccessible::AppendLabelText(nsIDOMNode *aLabelNode, nsAString& _retval)
+NS_IMETHODIMP nsAccessible::AppendLabelText(nsIDOMNode *aLabelNode, nsAWritableString& _retval)
 {
   NS_ASSERTION(aLabelNode, "Label Node passed in is null");
   nsCOMPtr<nsIDOMXULLabelElement> labelNode(do_QueryInterface(aLabelNode));
@@ -1288,7 +1364,7 @@ NS_IMETHODIMP nsAccessible::AppendLabelText(nsIDOMNode *aLabelNode, nsAString& _
 /**
   * Called for HTML work only
   */
-NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, const nsAString *aId, nsAString *aLabel)
+NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel)
 {
   PRInt32 numChildren = 0;
 
@@ -1322,7 +1398,7 @@ NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, const nsAStrin
   *   the DOM tree to the form, concatonating label elements as it goes. Then checks for
   *   labels with the for="controlID" property.
   */
-NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAString& _retval)
+NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIContent> walkUpContent(do_QueryInterface(mDOMNode));
   nsCOMPtr<nsIDOMHTMLLabelElement> labelElement;
@@ -1377,7 +1453,7 @@ NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAString& _retval)
   *  the child label for its Name.
   */
 /* wstring getAccName (); */
-NS_IMETHODIMP nsAccessible::GetXULAccName(nsAString& _retval)
+NS_IMETHODIMP nsAccessible::GetXULAccName(nsAWritableString& _retval)
 {
   nsresult rv;
   nsAutoString label;
@@ -1447,10 +1523,8 @@ NS_IMETHODIMP nsAccessible::GetXULAccName(nsAString& _retval)
   }  // END of CASE #1
 
   label.CompressWhitespace();
-  if (label.IsEmpty()) {
-    nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-    return nsAccessible::AppendFlatStringFromSubtree(content, &_retval);
-  }
+  if (label.IsEmpty())
+    return nsAccessible::GetAccName(_retval);
   
   _retval.Assign(label);
   return NS_OK;

mozilla/accessible/src/base/nsAccessible.h

@@ -43,7 +43,6 @@
 #include "nsCOMPtr.h"
 #include "nsGenericAccessible.h"
 #include "nsIAccessible.h"
-#include "nsIAccessibilityService.h"
 #include "nsIDOMNode.h"
 #include "nsIFocusController.h"
 #include "nsIPresContext.h"
@@ -54,7 +53,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsIBindingManager.h"
 
-#define ACCESSIBLE_BUNDLE_URL "chrome://global-platform/locale/accessible.properties"
+#define ACCESSIBLE_BUNDLE_URL "chrome://global/locale/accessible.properties"
 
 class nsIContent;
 class nsIDocShell;
@@ -66,15 +65,13 @@ enum { eSiblingsUninitialized = -1, eSiblingsWalkNormalDOM = -2};  // Used in si
 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,26 +87,58 @@ 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 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:
+  NS_IMETHOD AppendLabelText(nsIDOMNode *aLabelNode, nsAWritableString& _retval);
+  NS_IMETHOD AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel);
+  NS_IMETHOD GetHTMLAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetXULAccName(nsAWritableString& _retval); 
+
 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);
+  PRBool IsEntirelyVisible(); 
+  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString);
+  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString);
+  NS_IMETHOD AppendStringWithSpaces(nsAWritableString *aFlatString, nsAReadableString& 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);
 
   // Data Members
   nsCOMPtr<nsIDOMNode> mDOMNode;
@@ -119,50 +148,4 @@ protected:
   PRInt32 mSiblingIndex; // Cache where we are in list of kids that we got from nsIBindingManager::GetContentList(parentContent)
 };
 
-
-/** 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 {
-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;
-};
-
 #endif  

mozilla/accessible/src/base/nsBaseWidgetAccessible.cpp

@@ -65,7 +65,7 @@ NS_IMETHODIMP nsBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible
   // 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)
+  if (tx > x && tx < x + w && ty > y && ty < y + h)
   {
     // It's within this nsIAccessible, let's drill down
     nsCOMPtr<nsIAccessible> child;
@@ -87,7 +87,7 @@ NS_IMETHODIMP nsBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible
       // [[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 (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
       {
         if (smallestArea == -1 || cw*ch < smallestArea) {
           smallestArea = cw*ch;
@@ -130,7 +130,7 @@ NS_IMETHODIMP nsContainerAccessible::GetAccNumActions(PRUint8 *_retval)
 }
 
 /** no actions */
-NS_IMETHODIMP nsContainerAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsContainerAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   return NS_OK;
 }
@@ -149,13 +149,13 @@ NS_IMETHODIMP nsContainerAccessible::GetAccState(PRUint32 *_retval)
 }
 
 /** no value */
-NS_IMETHODIMP nsContainerAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsContainerAccessible::GetAccValue(nsAWritableString& _retval)
 {
   return NS_OK;
 }
 
 /** no name*/
-NS_IMETHODIMP nsContainerAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsContainerAccessible::GetAccName(nsAWritableString& _retval)
 {
   return NS_OK;
 }
@@ -221,8 +221,8 @@ NS_IMETHODIMP nsLinkableAccessible::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) {
@@ -238,33 +238,19 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccState(PRUint32 *_retval)
     }
   }
 
-  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;
-      }
-    }
-  }
-
+  // Focused? Do we implement that here or up the chain?
   return NS_OK;
 }
 
 
-NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAWritableString& _retval)
 {
   if (IsALink()) {
     nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mLinkContent));
     if (elt) 
       return elt->GetAttribute(NS_LITERAL_STRING("href"), _retval);
   }
-  return NS_ERROR_NOT_IMPLEMENTED;
+  return NS_ERROR_FAILURE;
 }
 
 
@@ -276,17 +262,16 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccNumActions(PRUint8 *_retval)
 }
 
 /* wstring getAccActionName (in PRUint8 index); */
-NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   // Action 0 (default action): Jump to link
   if (index == eAction_Jump) {   
     if (IsALink()) {
-      nsAccessible::GetTranslatedString(NS_LITERAL_STRING("jump"), _retval); 
+      _retval = NS_LITERAL_STRING("jump"); 
       return NS_OK;
     }
-    return NS_ERROR_NOT_IMPLEMENTED;
   }
-  return NS_ERROR_INVALID_ARG;
+  return NS_ERROR_FAILURE;
 }
 
 /* void accDoAction (in PRUint8 index); */
@@ -323,7 +308,7 @@ NS_IMETHODIMP nsLinkableAccessible::AccDoAction(PRUint8 index)
       }
     }
   }
-  return NS_ERROR_INVALID_ARG;
+  return NS_ERROR_FAILURE;
 }
 
 

mozilla/accessible/src/base/nsBaseWidgetAccessible.h

@@ -71,11 +71,11 @@ class nsContainerAccessible : public nsAccessible
 public:
   nsContainerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   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);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
 };
 
 /** 
@@ -100,10 +100,10 @@ class nsLinkableAccessible : public nsAccessible
 public:
   nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   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);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
 
 protected:
   PRBool IsALink();

mozilla/accessible/src/base/nsFormControlAccessible.cpp

@@ -102,7 +102,7 @@ NS_IMETHODIMP nsFormControlAccessible::GetAccState(PRUint32 *_retval)
   *  merely checks who is calling and then calls the appropriate
   *  protected method for the XUL or HTML element.
   */
-NS_IMETHODIMP nsFormControlAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsFormControlAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMXULElement> xulFormElement(do_QueryInterface(mDOMNode));
   if (xulFormElement)
@@ -159,10 +159,10 @@ NS_IMETHODIMP nsRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval)
 /**
   *
   */
-NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("select"), _retval); 
+    _retval = NS_LITERAL_STRING("select");
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;

mozilla/accessible/src/base/nsFormControlAccessible.h

@@ -51,7 +51,7 @@ class nsFormControlAccessible : public nsAccessible
 {
 public:
   nsFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
   NS_IMETHOD GetAccState(PRUint32 *_retval); 
   NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
   NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
@@ -69,7 +69,7 @@ public:
   nsRadioButtonAccessible(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);
 };
 
 /**

mozilla/accessible/src/base/nsGenericAccessible.cpp

@@ -38,6 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsGenericAccessible.h"
+#include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIWeakReference.h"
 #include "nsReadableUtils.h"
@@ -94,25 +95,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 +137,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 +155,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;
 }

mozilla/accessible/src/base/nsRootAccessible.cpp

@@ -47,7 +47,6 @@
 #include "nsIFrame.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMElement.h"
-#include "nsIDOMNSEvent.h"
 #include "nsIDOMEventReceiver.h"
 #include "nsIDOMEventListener.h"
 #include "nsReadableUtils.h"
@@ -71,11 +70,11 @@
 #include "nsIServiceManager.h"
 #include "nsHTMLSelectAccessible.h"
 #include "nsIDOMHTMLSelectElement.h"
+#include "nsIWebProgress.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)
@@ -93,13 +92,6 @@ 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 
 //-----------------------------------------------------
@@ -112,12 +104,9 @@ nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell):nsAccessible(nsnull
   if (shell) {
     shell->GetDocument(getter_AddRefs(mDocument));
     mDOMNode = do_QueryInterface(mDocument);
+
+    nsLayoutAtoms::AddRefAtoms();
   }
-  nsLayoutAtoms::AddRefAtoms();
-  ++gInstanceCount;
-#ifdef DEBUG_LEAKS
-  printf("=====> %d nsRootAccessible's %x\n", gInstanceCount, (PRUint32)this); 
-#endif
 }
 
 //-----------------------------------------------------
@@ -125,18 +114,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();
 }
 
   /* attribute wstring accName; */
-NS_IMETHODIMP nsRootAccessible::GetAccName(nsAString& aAccName) 
+NS_IMETHODIMP nsRootAccessible::GetAccName(nsAWritableString& aAccName) 
 { 
   return GetTitle(aAccName);
 }
@@ -156,8 +139,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 +160,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,20 +183,6 @@ 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;
 }
 
@@ -226,7 +194,7 @@ NS_IMETHODIMP nsRootAccessible::GetAccState(PRUint32 *aAccState)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAString& aAccValue)
+NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAWritableString& aAccValue)
 {
   return GetURL(aAccValue);
 }
@@ -241,81 +209,80 @@ void nsRootAccessible::Notify(nsITimer *timer)
   }
 }
 
-void nsRootAccessible::StartDocReadyTimer()
+NS_IMETHODIMP nsRootAccessible::StartDocReadyTimer()
 {
+  nsresult rv;
   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);
+      rv = mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kUpdateTimerDelay);
     }
   }
+
+  return rv;
 }
 
 /* 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;
 
   mListener =  aListener;
 
+  // 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));
+  if (!document)
+    return NS_ERROR_FAILURE;
+
   // use AddEventListener from the nsIDOMEventTarget interface
-  nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(mDocument));
+  nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(document));
   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");
+    rv = target->AddEventListener(NS_LITERAL_STRING("blur"), 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);
+    // add ourself as a RadiobuttonStateChange listener (custom event fired in nsHTMLInputElement.cpp)
+    rv = target->AddEventListener(NS_LITERAL_STRING("RadiobuttonStateChange"), 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
+    // Extremely short timer, after which we announce that pane 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<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));
+      if (container) {
         nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
         if (docShell) {
-          mWebProgress = do_GetInterface(docShell);
-          mWebProgress->AddProgressListener(this, nsIWebProgress::NOTIFY_LOCATION | 
-                                                  nsIWebProgress::NOTIFY_STATE_DOCUMENT);
+          nsCOMPtr<nsIWebProgress> webProgress(do_GetInterface(docShell));
+          if (webProgress) {
+            webProgress->AddProgressListener(this);
+          }
         }
       }
     }
-    NS_ASSERTION(mWebProgress, "Could not get nsIWebProgress for nsRootAccessible");
   }
 
   return NS_OK;
@@ -325,43 +292,25 @@ NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventLis
 NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener()
 {
   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);
+    nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+    nsCOMPtr<nsIDocument> document;
+    if (shell) {
+      shell->GetDocument(getter_AddRefs(document));
+      nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(document));
+      if (eventReceiver) {
+        nsresult rv = eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to unregister listener");
+        rv = eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFormListener *, this), NS_GET_IID(nsIDOMFormListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to unregister listener");
+      }
     }
- 
-    if (mTimer) {
-      mTimer->Cancel();
-      mTimer = nsnull;
-    }
-
-    if (mWebProgress) {
-      mWebProgress->RemoveProgressListener(this);
-      mWebProgress = nsnull;
-    }
-    mListener = nsnull;
   }
 
+  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 +325,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 +333,28 @@ 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);
+      if (eventType.EqualsIgnoreCase("focus")) {
+        if (mCurrentFocus != targetNode) {
+          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
+          mCurrentFocus = targetNode;
         }
-        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);
-          mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, accessible);
+        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 { // for the html radio buttons -- apparently the focus code just works. :-)
+        else 
           mListener->HandleEvent(nsIAccessibleEventListener::EVENT_STATE_CHANGE, accessible);
-        }
       }
-      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("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 +363,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 +402,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);
 }
@@ -528,7 +435,7 @@ NS_IMETHODIMP nsRootAccessible::GetDocument(nsIDocument **doc)
 }
 
 NS_IMETHODIMP nsRootAccessible::OnStateChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, PRUint32 aStateFlags, nsresult aStatus)
+  nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 aStatus)
 {
   return NS_OK;
 }
@@ -538,7 +445,6 @@ 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;
 }
 
@@ -560,15 +466,13 @@ NS_IMETHODIMP nsRootAccessible::OnLocationChange(nsIWebProgress *aWebProgress,
 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); */
+/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long state); */
 NS_IMETHODIMP nsRootAccessible::OnSecurityChange(nsIWebProgress *aWebProgress,
-  nsIRequest *aRequest, PRUint32 state)
+  nsIRequest *aRequest, PRInt32 state)
 {
-  NS_NOTREACHED("notification excluded in AddProgressListener(...)");
   return NS_OK;
 }
 
@@ -587,37 +491,36 @@ 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;
+  NS_ASSERTION(presShell,"Shell is gone!!! What are we doing here?");
 
   nsCOMPtr<nsIDocShell> docShell;
   GetDocShellFromPS(presShell, getter_AddRefs(docShell));
 
   nsCOMPtr<nsIWebNavigation> webNav(do_GetInterface(docShell));
-  nsCAutoString theURL;
+  nsXPIDLCString theURL;
   if (webNav) {
     nsCOMPtr<nsIURI> pURI;
     webNav->GetCurrentURI(getter_AddRefs(pURI));
     if (pURI) 
-      pURI->GetSpec(theURL);
+      pURI->GetSpec(getter_Copies(theURL));
   }
   //XXXaaronl Need to use CopyUTF8toUCS2(nsDependentCString(theURL), aURL); when it's written
-  aURL.Assign(NS_ConvertUTF8toUCS2(theURL)); 
+  aURL.Assign(NS_ConvertUTF8toUCS2(theURL).get()); 
   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) {
@@ -626,7 +529,7 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAString& 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 +546,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;

mozilla/accessible/src/base/nsRootAccessible.h

@@ -44,7 +44,6 @@
 #include "nsIAccessibleEventListener.h"
 #include "nsIAccessibleDocument.h"
 #include "nsIDOMFormListener.h"
-#include "nsIDOMXULListener.h"
 #include "nsIDOMFocusListener.h"
 #include "nsIDocument.h"
 #include "nsIAccessibilityService.h"
@@ -52,7 +51,6 @@
 #include "nsIWeakReference.h"
 #include "nsITimer.h"
 #include "nsITimerCallback.h"
-#include "nsIWebProgress.h"
 
 
 class nsDocAccessibleMixin
@@ -66,6 +64,7 @@ class nsDocAccessibleMixin
 
   protected:
     NS_IMETHOD GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
+    PRBool mTopLevelDocument;
     nsCOMPtr<nsIDocument> mDocument;
 };
 
@@ -75,7 +74,6 @@ class nsRootAccessible : public nsAccessible,
                          public nsIAccessibleEventReceiver,
                          public nsIDOMFocusListener,
                          public nsIDOMFormListener,
-                         public nsIDOMXULListener,
                          public nsIWebProgressListener,
                          public nsITimerCallback, 
                          public nsSupportsWeakReference
@@ -91,8 +89,8 @@ class nsRootAccessible : public nsAccessible,
     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);
@@ -115,16 +113,8 @@ 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_IMETHOD StartDocReadyTimer();
 
     NS_DECL_NSIACCESSIBLEDOCUMENT
     NS_DECL_NSIWEBPROGRESSLISTENER
@@ -133,10 +123,6 @@ class nsRootAccessible : public nsAccessible,
     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
     // it is the callers responsibility to remove the listener
@@ -144,10 +130,8 @@ class nsRootAccessible : public nsAccessible,
     // 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;
+    nsCOMPtr<nsIDOMNode> mCurrentFocus;
     nsCOMPtr<nsIAccessibilityService> mAccService;
     EBusyState mBusy;
 };

mozilla/accessible/src/base/nsSelectAccessible.cpp

@@ -45,8 +45,6 @@
 #include "nsIDOMEventReceiver.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsIDOMHTMLOptionElement.h"
-#include "nsIDOMHTMLOptGroupElement.h"
-#include "nsIDOMText.h"
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsIFrame.h"
 #include "nsIListControlFrame.h"
@@ -54,7 +52,6 @@
 #include "nsLayoutAtoms.h"
 #include "nsRootAccessible.h"
 #include "nsSelectAccessible.h"
-#include "nsIServiceManager.h"
 
 /** ------------------------------------------------------ */
 /**  First, the common widgets                             */
@@ -112,42 +109,7 @@ NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
 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;
+  mParent = aParent;
 }
 
 /** We are a ListItem */
@@ -168,42 +130,21 @@ NS_IMETHODIMP nsSelectOptionAccessible::GetAccParent(nsIAccessible **_retval)
 /**
   * Get our Name from our Content's subtree
   */
-NS_IMETHODIMP nsSelectOptionAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsSelectOptionAccessible::GetAccName(nsAWritableString& _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;
+  nsCOMPtr<nsIContent> content (do_QueryInterface(mDOMNode));
+  if (!content) {
+    return NS_ERROR_FAILURE;
   }
-  
-  // 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;
-      }
-    }
+  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 NS_ERROR_FAILURE;
+  return rv;
 }
 
 /** ------------------------------------------------------ */
@@ -411,7 +352,7 @@ nsLeafAccessible(aDOMNode, aShell)
   *     and then return that text.
   *     Walks the Frame tree and checks for proper frames.
   */
-NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccValue(nsAWritableString& _retval)
 {
   nsIFrame* frame = nsAccessible::GetBoundsFrame();
   nsCOMPtr<nsIPresContext> context;
@@ -539,14 +480,14 @@ void nsComboboxButtonAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBounding
   if (!context)
     return;
 
-  *aBoundingFrame = frame;  // bounding frame is the ComboboxControlFrame
-  frame->FirstChild(context, nsnull, &frame); // first frame is for the textfield
+  frame->FirstChild(context, nsnull, &frame);
 #ifdef DEBUG
   if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::blockFrame))
     return;
 #endif
 
-  frame->GetNextSibling(&frame);  // sibling frame is for the button
+  frame->GetNextSibling(aBoundingFrame);
+  frame->GetNextSibling(&frame);
 #ifdef DEBUG
   if (! nsAccessible::IsCorrectFrameType(frame, nsLayoutAtoms::gfxButtonControlFrame))
     return;
@@ -573,7 +514,7 @@ NS_IMETHODIMP nsComboboxButtonAccessible::GetAccParent(nsIAccessible **_retval)
 /** 
   * Gets the name from GetAccActionName()
   */
-NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAWritableString& _retval)
 {
   return GetAccActionName(eAction_Click, _retval);
 }
@@ -584,7 +525,7 @@ NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAString& _retval)
   *     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)
+NS_IMETHODIMP nsComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   PRBool isOpen = PR_FALSE;
   nsIFrame *boundsFrame = GetBoundsFrame();
@@ -594,9 +535,9 @@ NS_IMETHODIMP nsComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAStr
     return NS_ERROR_FAILURE;
   comboFrame->IsDroppedDown(&isOpen);
   if (isOpen)
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("close"), _retval); 
+    _retval = NS_LITERAL_STRING("Close");
   else
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("open"), _retval); 
+    _retval = NS_LITERAL_STRING("Open");
 
   return NS_OK;
 }
@@ -722,10 +663,6 @@ void nsComboboxWindowAccessible::GetBounds(nsRect& aBounds, nsIFrame** aBounding
   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;

mozilla/accessible/src/base/nsSelectAccessible.h

@@ -82,10 +82,9 @@ public:
   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);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
 
 protected:
   
@@ -173,7 +172,7 @@ public:
   NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
   NS_IMETHOD GetAccParent(nsIAccessible **_retval);
   NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
   NS_IMETHOD GetAccState(PRUint32 *_retval);
 
   virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
@@ -196,10 +195,10 @@ public:
 
   /* ----- nsIAccessible ----- */
   NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(nsAString& _retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
   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 GetAccState(PRUint32 *_retval);
 
   virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);

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

@@ -56,7 +56,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 +74,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 +83,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

@@ -51,16 +51,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

@@ -45,7 +45,6 @@
 #include "nsIDOMHTMLButtonElement.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMNSHTMLButtonElement.h"
 #include "nsIDOMHTMLLabelElement.h"
 #include "nsIDOMHTMLTextAreaElement.h"
 #include "nsIDOMXULCheckboxElement.h"
@@ -77,7 +76,7 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccNumActions(PRUint8 *_retval)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   if (index == eAction_Click) {    // 0 is the magic value for default action
     // check or uncheck
@@ -85,9 +84,9 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAStrin
     GetAccState(&state);
 
     if (state & STATE_CHECKED)
-      nsAccessible::GetTranslatedString(NS_LITERAL_STRING("uncheck"), _retval); 
+      _retval = NS_LITERAL_STRING("uncheck");
     else
-      nsAccessible::GetTranslatedString(NS_LITERAL_STRING("check"), _retval); 
+      _retval = NS_LITERAL_STRING("check");
 
     return NS_OK;
   }
@@ -98,8 +97,10 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoAction(PRUint8 index)
 {
   if (index == 0) {   // 0 is the magic value for default action
     nsCOMPtr<nsIDOMHTMLInputElement> htmlCheckboxElement(do_QueryInterface(mDOMNode));
+    PRBool checked = PR_FALSE;
     if (htmlCheckboxElement) {
-      htmlCheckboxElement->Click();
+      htmlCheckboxElement->GetChecked(&checked);
+      htmlCheckboxElement->SetChecked(!checked);
       return NS_OK;
     }
     return NS_ERROR_FAILURE;
@@ -133,10 +134,8 @@ NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index)
 {
   if (index == eAction_Click) {
     nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
-    if (element) {
-      element->Click();
-      return NS_OK;
-    }
+    element->Click();
+    return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
 }
@@ -166,13 +165,13 @@ nsFormControlAccessible(aNode, aShell)
 NS_IMETHODIMP nsHTMLButtonAccessible::GetAccNumActions(PRUint8 *_retval)
 {
   *_retval = eSingle_Action;
-  return NS_OK;
+  return NS_OK;;
 }
 
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); 
+    _retval = NS_LITERAL_STRING("press");
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
@@ -180,37 +179,21 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAString&
 
 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;
-}
-
 NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUint32 *_retval)
 {
   *_retval = ROLE_PUSHBUTTON;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMHTMLInputElement> button(do_QueryInterface(mDOMNode));
 
@@ -229,7 +212,7 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAString& _retval)
 // ----- HTML 4 Button: can contain arbitrary HTML content -----
 
 nsHTML4ButtonAccessible::nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-nsLeafAccessible(aNode, aShell)
+nsBlockAccessible(aNode, aShell)
 { 
 }
 
@@ -239,10 +222,10 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccNumActions(PRUint8 *_retval)
   return NS_OK;;
 }
 
-NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); 
+    _retval = NS_LITERAL_STRING("press");
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
@@ -251,10 +234,10 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAString
 NS_IMETHODIMP nsHTML4ButtonAccessible::AccDoAction(PRUint8 index)
 {
   if (index == 0) {
-    nsCOMPtr<nsIDOMNSHTMLButtonElement> buttonElement(do_QueryInterface(mDOMNode));
-    if ( buttonElement )
+    nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(mDOMNode));
+    if ( inputElement )
     {
-      buttonElement->Click();
+      inputElement->Click();
       return NS_OK;
     }
     return NS_ERROR_FAILURE;
@@ -272,19 +255,10 @@ 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)
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAWritableString& _retval)
 {
   nsresult rv = NS_ERROR_FAILURE;
   nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
@@ -294,7 +268,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);
   }
@@ -316,7 +290,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccRole(PRUint32 *_retval)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAWritableString& _retval)
 {
   PRUint32 state;
   GetAccState(&state);
@@ -364,8 +338,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) {
@@ -400,47 +374,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

@@ -52,7 +52,7 @@ 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); 
 };
@@ -72,23 +72,22 @@ class nsHTMLButtonAccessible : public nsFormControlAccessible
 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 nsBlockAccessible
 {
 
 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);
 };
 
@@ -97,17 +96,8 @@ class nsHTMLTextFieldAccessible : public nsFormControlAccessible
 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

@@ -54,6 +54,7 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
 NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameAccessible, nsBlockAccessible);
 NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameAccessible, nsBlockAccessible);
 
+
 NS_IMETHODIMP
 nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
 {
@@ -68,18 +69,19 @@ nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   return nsBlockAccessible::QueryInterface(aIID, aInstancePtr); 
 }
 
+
 nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *aDoc):
   nsBlockAccessible(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);
 }
@@ -114,27 +116,27 @@ NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccState(PRUint32 *aAccState)
   return nsAccessible::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);
 }

mozilla/accessible/src/html/nsHTMLIFrameRootAccessible.h

@@ -60,8 +60,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);
 

mozilla/accessible/src/html/nsHTMLImageAccessible.cpp

@@ -110,7 +110,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 +119,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

@@ -56,7 +56,7 @@ class nsHTMLImageAccessible : public nsLinkableAccessible
 
 public:
   nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval); 
+  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

@@ -54,7 +54,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 +62,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

@@ -48,7 +48,7 @@ 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.cpp

@@ -46,13 +46,10 @@
 #include "nsIDOMHTMLCollection.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIDOMHTMLOptionElement.h"
-#include "nsIDOMHTMLOptGroupElement.h"
 #include "nsIDOMHTMLSelectElement.h"
-#include "nsIDOMHTMLOListElement.h"
 #include "nsIListControlFrame.h"
 #include "nsIServiceManager.h"
 #include "nsLayoutAtoms.h"
-#include "nsIDocument.h"
 
 /**
   * Selects, Listboxes and Comboboxes, are made up of a number of different
@@ -63,7 +60,7 @@
   *
   *  Listbox:
   *     - nsHTMLListboxAccessible
-  *        - nsHTMLSelectListAccessible
+  *        - nsHTMLSelctListAccessible
   *           - nsHTMLSelectOptionAccessible
   *
   *  Comboboxes:
@@ -71,7 +68,7 @@
   *        - nsHTMLComboboxTextFieldAccessible
   *        - nsHTMLComboboxButtonAccessible
   *        - nsHTMLComboboxWindowAccessilbe
-  *           - nsHTMLSelectListAccessible
+  *           - nsHTMLSelctListAccessible
   *              - nsHTMLSelectOptionAccessible
   */
 
@@ -124,44 +121,19 @@ NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccLastChild(nsIAccessible **_retva
 }
 
 /**
-  * Gets the child count of a Select List Accessible. We want to count 
-  *  all the <optgroup>s and <option>s as children because we want a 
-  *  flat tree under the Select List.
+  * Gets the First child of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
   */
-
-NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
+NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccFirstChild(nsIAccessible **_retval)
 {
-    // Count the number of <Option Group> and <option> elements and return 
-    // this number. This is so the tree can be flattened
-  nsCOMPtr<nsIDOMNode> next, nextInner, nextChild;
-  nsCOMPtr<nsIDOMHTMLOptionElement> optionElement(do_QueryInterface(mDOMNode));
+  nsCOMPtr<nsIDOMNode> first;
+  mDOMNode->GetFirstChild(getter_AddRefs(first));
 
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  PRInt32 countChild;
-
-  countChild = 0;
-  mDOMNode->GetFirstChild(getter_AddRefs(next));
-
-  while (next) {
-    nsCOMPtr<nsIDOMHTMLOptGroupElement> optGroupElement(do_QueryInterface(next));
-    countChild++;
-    if (optGroupElement) {
-      next->GetFirstChild(getter_AddRefs(nextInner));
-      while (nextInner ) {
-        nsCOMPtr<nsIDOMHTMLOptionElement> optionElement(do_QueryInterface(nextInner));
-        if (optionElement) {
-          countChild++;
-        }
-        nextInner->GetNextSibling(getter_AddRefs(nextChild));
-        nextInner = nextChild;
-      } // endWhile nextInner
-    }  // endif optGroupElement
-    next->GetNextSibling(getter_AddRefs(nextInner));
-    next = nextInner;
-  }  // endWhile next
-  *aAccChildCount = countChild;
+  *_retval = new nsHTMLSelectOptionAccessible(this, first, mPresShell);
+  if ( ! *_retval )
+    return NS_ERROR_FAILURE;
+  NS_ADDREF(*_retval);
   return NS_OK;
-
 }
 
 /** ----- nsHTMLSelectOptionAccessible ----- */
@@ -173,92 +145,44 @@ nsSelectOptionAccessible(aParent, aDOMNode, aShell)
 }
 
 /**
-  * Gets the next accessible sibling of the mDOMNode and creates and returns
-  *  a nsHTMLSelectOptionAccessible or nsHTMLSelectOptGroupAccessible.
+  * Gets the next sibling of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
   */
 NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccNextSibling(nsIAccessible **_retval)
 { 
-  // Get next sibling and if found create and return an accessible for it
-  // When getting the next sibling of an SelectOption we could be working with
-  // either an optgroup or an option. We process this tree as flat.
   *_retval = nsnull;
 
   nsCOMPtr<nsIDOMNode> next;
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  
-  nsCOMPtr<nsIDOMHTMLOptGroupElement> currOptGroupElement(do_QueryInterface(mDOMNode));
-  
-  if (currOptGroupElement) {
-    mDOMNode->GetFirstChild(getter_AddRefs(next));
-  }
-  if (!next)  // no child under a <optgroup> or we started with a <option>
-    mDOMNode->GetNextSibling(getter_AddRefs(next));  // See if there is another <optgroup>
-  
+  mDOMNode->GetNextSibling(getter_AddRefs(next));
+
   if (next) {
-    accService->GetAccessibleFor(next, _retval);  
-    return NS_OK;
+    *_retval = new nsHTMLSelectOptionAccessible(mParent, next, mPresShell);
+    if ( ! *_retval )
+      return NS_ERROR_FAILURE;
+    NS_ADDREF(*_retval);
   }
-  // else No child then or child is not a <option> nor an <optgroup>
-  // go back up to the parent and get next sibling from there,
-  nsCOMPtr<nsIDOMNode> parent, parentNextSib;
-  mDOMNode->GetParentNode(getter_AddRefs(parent));
- 
-  if (!parent) {
-    return NS_OK;
-  } else {
-    nsCOMPtr<nsIDOMHTMLOListElement> listElement(do_QueryInterface(parent));
-    if (listElement)  // we are done!
-      return NS_OK;
-  }
-  parent->GetNextSibling(getter_AddRefs(parentNextSib));
-  if (!parentNextSib) 
-    return NS_OK; // done
-  
-  // We have a parent that is an option or option group
-  // get accessible for either one and return it 
-  accService->GetAccessibleFor(parentNextSib, _retval);
+
   return NS_OK;
 } 
 
 /**
-  * Gets the previous accessible sibling of the mDOMNode and creates and returns
-  *  a nsHTMLSelectOptionAccessible or nsHTMLSelectOptGroupAccessible.
+  * Gets the previous sibling of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
   */
 NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
 { 
   *_retval = nsnull;
 
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  nsCOMPtr<nsIAccessible> thisAcc, selectListAcc, nextSiblingAcc;  
+  nsCOMPtr<nsIDOMNode> prev;
+  mDOMNode->GetPreviousSibling(getter_AddRefs(prev));
 
-  accService->GetAccessibleFor(mDOMNode, getter_AddRefs(thisAcc));
-
-  // The accessible parent of an <option> or <optgroup> is always the SelectListAcc - see GetAccessibleFor()
-  thisAcc->GetAccParent(getter_AddRefs(selectListAcc));
-
-  if (!selectListAcc) {
-    return NS_ERROR_FAILURE;  
-  }
-  nsCOMPtr<nsIDOMNode> siblingDOMNode;
-  selectListAcc->GetAccFirstChild(_retval);
-
-  // Go thru all the siblings until we find ourselves(mDOMNode) then use the 
-  // sibling right before us.
-  do {  
-    (*_retval)->GetAccNextSibling(getter_AddRefs(nextSiblingAcc));
-    if (!nextSiblingAcc) {
-      *_retval = nsnull;
+  if (prev) {
+    *_retval = new nsHTMLSelectOptionAccessible(mParent, prev, mPresShell);
+    if ( ! *_retval )
       return NS_ERROR_FAILURE;
-    }
-    nextSiblingAcc->AccGetDOMNode(getter_AddRefs(siblingDOMNode));
-    if (siblingDOMNode == mDOMNode) {
-      break;  // we found ourselves!
-    }
-    NS_RELEASE(*_retval);
-    *_retval = nextSiblingAcc;
-    NS_IF_ADDREF(*_retval);
-  } while (nextSiblingAcc);
-  
+    NS_ADDREF(*_retval);
+  }
+
   return NS_OK;
 } 
 
@@ -274,22 +198,9 @@ NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccState(PRUint32 *_retval)
 {
   *_retval = 0;
   nsCOMPtr<nsIDOMNode> focusedOptionNode, parentNode;
-  // Go up to parent <select> element
-  nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(mDOMNode));
-  do {
-    thisNode->GetParentNode(getter_AddRefs(parentNode));
-    nsCOMPtr<nsIDOMHTMLSelectElement> selectControl(do_QueryInterface(parentNode));
-    if (selectControl) {
-      break;
-    }
-    thisNode = parentNode;
-  } while (parentNode);
-  if (!parentNode) {
-    return NS_ERROR_FAILURE;
-  }
-  
+  mParent->AccGetDOMNode(getter_AddRefs(parentNode));
   // find out if we are the focused node
-  GetFocusedOptionNode(parentNode, focusedOptionNode);
+  GetFocusedOptionNode(mPresShell, parentNode, focusedOptionNode);
   if (focusedOptionNode == mDOMNode)
     *_retval |= STATE_FOCUSED;
 
@@ -312,43 +223,36 @@ NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetAccState(PRUint32 *_retval)
   *  need to use the frame to get the focused option because for some reason we
   *  weren't getting the proper notification when the focus changed using the DOM
   */
-nsresult nsHTMLSelectOptionAccessible::GetFocusedOptionNode(nsIDOMNode *aListNode, 
+nsresult nsHTMLSelectOptionAccessible::GetFocusedOptionNode(nsIWeakReference *aPresShell, 
+                                                            nsIDOMNode *aListNode, 
                                                             nsCOMPtr<nsIDOMNode>& aFocusedOptionNode)
 {
   NS_ASSERTION(aListNode, "Called GetFocusedOptionNode without a valid list node");
-
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aListNode));
-  nsCOMPtr<nsIDocument> document;
-  content->GetDocument(*getter_AddRefs(document));
-  nsCOMPtr<nsIPresShell> shell;
-  if (document) 
-    document->GetShellAt(0,getter_AddRefs(shell));
+  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);
 
-  PRInt32 focusedOptionIndex = 0;
+  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 options
-  nsCOMPtr<nsIDOMHTMLSelectElement> selectElement(do_QueryInterface(aListNode));
-  NS_ASSERTION(selectElement, "No select element where it should be");
+  // Get what's focused by asking frame for "selected item". 
+  PRInt32 focusedOptionIndex = 0;
+  rv = listFrame->GetSelectedIndex(&focusedOptionIndex);  
 
   nsCOMPtr<nsIDOMHTMLCollection> options;
-  nsresult rv = selectElement->GetOptions(getter_AddRefs(options));
-  
+
+  // Get options
   if (NS_SUCCEEDED(rv)) {
-    nsCOMPtr<nsIListControlFrame> listFrame(do_QueryInterface(frame));
-    if (listFrame) {
-      // Get what's focused in listbox by asking frame for "selected item". 
-      // Can't use dom interface for this, because it will always return the first selected item
-      // when there is more than 1 item selected. We need the focused item, not
-      // the first selected item.
-      rv = listFrame->GetSelectedIndex(&focusedOptionIndex);
-    }
-    else  // Combo boxes can only have 1 selected option, so they can use the dom interface for this
-      rv = selectElement->GetSelectedIndex(&focusedOptionIndex);
+    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
@@ -362,27 +266,6 @@ nsresult nsHTMLSelectOptionAccessible::GetFocusedOptionNode(nsIDOMNode *aListNod
   return rv;
 }
 
-/** ----- nsHTMLSelectOptGroupAccessible ----- */
-
-/** Default Constructor */
-nsHTMLSelectOptGroupAccessible::nsHTMLSelectOptGroupAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
-nsHTMLSelectOptionAccessible(aParent, aDOMNode, aShell)
-{
-}
-
-
-/**
-  * As a nsHTMLSelectOptGroupAccessible we can have the following states:
-  *     STATE_SELECTABLE
-  */
-NS_IMETHODIMP nsHTMLSelectOptGroupAccessible::GetAccState(PRUint32 *_retval)
-{
-  nsHTMLSelectOptionAccessible::GetAccState(_retval);
-  *_retval &= ~(STATE_FOCUSABLE|STATE_SELECTABLE);
-  
-  return NS_OK;
-}
-
 /** ------------------------------------------------------ */
 /**  Secondly, the Listbox widget                          */
 /** ------------------------------------------------------ */
@@ -426,7 +309,7 @@ NS_IMETHODIMP nsHTMLListboxAccessible::GetAccFirstChild(nsIAccessible **_retval)
   * Our value is the value of our ( first ) selected child. nsIDOMHTMLSelectElement
   *     returns this by default with GetValue().
   */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsHTMLListboxAccessible::GetAccValue(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMHTMLSelectElement> select (do_QueryInterface(mDOMNode));
   if ( select ) {
@@ -537,7 +420,7 @@ NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccFirstChild(nsIAccessible **_retval
   * Our value is the value of our ( first ) selected child. nsIDOMHTMLSelectElement
   *     returns this by default with GetValue().
   */
-NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccValue(nsAString& _retval)
+NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccValue(nsAWritableString& _retval)
 {
   nsCOMPtr<nsIDOMHTMLSelectElement> select (do_QueryInterface(mDOMNode));
   if (select) {

mozilla/accessible/src/html/nsHTMLSelectAccessible.h

@@ -54,14 +54,14 @@
   *
   *  Listbox:
   *     - nsHTMLListboxAccessible
-  *        - nsHTMLSelectListAccessible
+  *        - nsHTMLSelctListAccessible
   *           - nsHTMLSelectOptionAccessible
   *
   *  Comboboxes:
-  *     - nsHTMLComboboxAccessible
+  *     - nsHTMLComboboxAccessilbe
   *        - nsHTMLComboboxTextFieldAccessible
   *        - nsHTMLComboboxButtonAccessible
-  *        - nsHTMLComboboxWindowAccessible
+  *        - nsHTMLComboboxWindowAccessilbe
   *           - nsHTMLSelectListAccessible
   *              - nsHTMLSelectOptionAccessible(s)
   */
@@ -83,7 +83,7 @@ public:
   /* ----- nsIAccessible ----- */
   NS_IMETHOD GetAccState(PRUint32 *_retval);
   NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *aAccChildCount) ;
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
 
 };
 
@@ -102,22 +102,7 @@ public:
   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);
+  static nsresult GetFocusedOptionNode(nsIWeakReference *aPresShell, nsIDOMNode *aListNode, nsCOMPtr<nsIDOMNode>& aFocusedOptionNode);
 
 };
 
@@ -142,7 +127,7 @@ public:
   /* ----- nsIAccessible ----- */
   NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
   NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
 
 };
 
@@ -163,7 +148,7 @@ public:
   /* ----- nsIAccessible ----- */
   NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
   NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccValue(nsAString& _retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
 
 };
 

mozilla/accessible/src/html/nsHTMLTableAccessible.cpp

@@ -40,7 +40,6 @@
 #include "nsHTMLTableAccessible.h"
 #include "nsWeakReference.h"
 #include "nsReadableUtils.h"
-#include "nsIDOMElement.h"
 
 nsHTMLTableCellAccessible::nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
 nsBlockAccessible(aDomNode, aShell)
@@ -48,16 +47,9 @@ nsBlockAccessible(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;
 }
 
@@ -67,35 +59,9 @@ nsBlockAccessible(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

@@ -47,8 +47,7 @@ class nsHTMLTableCellAccessible : public nsBlockAccessible
 {
 public:
   nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *aResult); 
-  NS_IMETHOD GetAccState(PRUint32 *aResult); 
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
 };
 
 
@@ -56,9 +55,7 @@ class nsHTMLTableAccessible : public nsBlockAccessible
 {
 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

@@ -45,7 +45,7 @@ nsTextAccessible(aDomNode, aShell)
 }
 
 /* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAString& _retval)
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval)
 { 
   return mDOMNode->GetNodeValue(_retval);
 }

mozilla/accessible/src/html/nsHTMLTextAccessible.h

@@ -48,7 +48,7 @@ class nsHTMLTextAccessible : public nsTextAccessible
 
 public:
   nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAString& _retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _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,71 @@
 # 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
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  content \
+		  content_xul \
+		  widget \
+		  dom \
+		  view \
+		  locale \
+		  intl \
+		  docshell \
+		  webshell \
+		  necko \
+		  htmlparser \
+		  imglib2 \
+		  gfx \
+		  gfx2 \
+		  uriloader \
+		  timer \
+		  $(NULL)
 
-include <$(DEPTH)\config\config.mak>
-
-DIRS = \
-  base \
-  html \
-!ifdef MOZ_XUL
-  xul \
-!endif
+CPP_OBJS= \
+        .\$(OBJDIR)\nsAccessible.obj \
+        .\$(OBJDIR)\nsAccessibilityService.obj \
+        .\$(OBJDIR)\nsBaseWidgetAccessible.obj \
+        .\$(OBJDIR)\nsFormControlAccessible.obj \
+        .\$(OBJDIR)\nsGenericAccessible.obj \
+        .\$(OBJDIR)\nsHTMLAreaAccessible.obj \
+        .\$(OBJDIR)\nsHTMLFormControlAccessible.obj \
+        .\$(OBJDIR)\nsHTMLIFrameRootAccessible.obj \
+        .\$(OBJDIR)\nsHTMLImageAccessible.obj \
+        .\$(OBJDIR)\nsHTMLLinkAccessible.obj \
+        .\$(OBJDIR)\nsHTMLSelectAccessible.obj \
+        .\$(OBJDIR)\nsHTMLTableAccessible.obj \
+        .\$(OBJDIR)\nsHTMLTextAccessible.obj \
+        .\$(OBJDIR)\nsRootAccessible.obj \
+        .\$(OBJDIR)\nsSelectAccessible.obj \
+        .\$(OBJDIR)\nsXULFormControlAccessible.obj \
+        .\$(OBJDIR)\nsXULTextAccessible.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,790 @@
+/* -*- 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):
+ * Original Author: David W. Hyatt (hyatt@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 "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 "nsITextContent.h"
+#include "nsTextFragment.h"
+#include "nsHTMLTableAccessible.h"
+#include "nsHTMLImageAccessible.h"
+#include "nsHTMLAreaAccessible.h"
+#include "nsHTMLLinkAccessible.h"
+#include "nsHTMLSelectAccessible.h"
+#include "nsIDOMHTMLAreaElement.h"
+#include "nsHTMLFormControlAccessible.h"
+#include "nsIAccessibleProvider.h"
+#include "nsILink.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMHTMLOptionElement.h"
+#include "nsIDOMXULCheckboxElement.h"
+#include "nsXULFormControlAccessible.h"
+#include "nsXULTextAccessible.h"
+#include "nsString.h"
+
+// IFrame
+#include "nsIDocShell.h"
+#include "nsHTMLIFrameRootAccessible.h"
+
+/**
+  * nsAccessibility Service
+  */
+
+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;
+}
+
+NS_IMETHODIMP nsAccessibilityService::CreateXULCheckboxAccessible(nsIDOMNode *aNode, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIWeakReference> weakShell;
+  GetShellFromNode(aNode, getter_AddRefs(weakShell));
+
+  // reusing the HTML accessible widget and enhancing for XUL
+  *_retval = new nsXULCheckboxAccessible(aNode, 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;
+}
+
+NS_IMETHODIMP nsAccessibilityService::CreateXULButtonAccessible(nsIDOMNode *aNode, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIWeakReference> weakShell;
+  GetShellFromNode(aNode, getter_AddRefs(weakShell));
+
+  // reusing the HTML accessible widget and enhancing for XUL
+  *_retval = new nsXULButtonAccessible(aNode, 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 = nsnull;
+
+  nsCOMPtr<nsITextContent> textContent(do_QueryInterface(node));
+  if (textContent) {
+    // If empty text string, don't include in accessible tree
+    // Items with length 0 are already gone, we just need to check for single NBSP's
+    PRInt32 textLength = 0;
+    textContent->GetTextLength(&textLength);
+    if (textLength == 1) {
+      const PRUnichar NBSP = 160;
+      const nsTextFragment *textFrag;
+      nsresult rv = textContent->GetText(&textFrag);
+      PRUnichar theChar = textFrag->CharAt(0);
+      if (theChar == NBSP)
+        return NS_ERROR_FAILURE;
+    }
+  }
+    
+  *_retval = new nsHTMLTextAccessible(node, weakShell);
+  if (! *_retval) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsAccessibilityService::CreateXULTextAccessible(nsIDOMNode *aNode, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIWeakReference> weakShell;
+  GetShellFromNode(aNode, getter_AddRefs(weakShell));
+
+  // reusing the HTML accessible widget and enhancing for XUL
+  *_retval = new nsXULTextAccessible(aNode, 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;
+}
+
+NS_IMETHODIMP nsAccessibilityService::CreateXULImageAccessible(nsIDOMNode *aNode, nsIAccessible **_retval)
+{
+  // Don't include nameless images in accessible tree
+  *_retval = nsnull;
+
+  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(aNode));
+  NS_ASSERTION(elt, "No DOM element or node!");
+  PRBool hasTextEquivalent;
+  elt->HasAttribute(NS_LITERAL_STRING("tooltiptext"), &hasTextEquivalent); // Prefer value over tooltiptext
+  if (!hasTextEquivalent) {
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIWeakReference> weakShell;
+  GetShellFromNode(aNode, getter_AddRefs(weakShell));
+
+  *_retval = new nsHTMLImageAccessible(aNode, 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;
+
+  *_retval = new nsHTMLImageAccessible(node, 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::GetShellFromNode(nsIDOMNode *aNode, nsIWeakReference **aWeakShell)
+{
+  nsCOMPtr<nsIDOMDocument> domDoc;
+  aNode->GetOwnerDocument(getter_AddRefs(domDoc));
+  nsCOMPtr<nsIDocument> 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;
+
+  nsCOMPtr<nsIWeakReference> weakRef(do_GetWeakReference(shell));
+  
+  *aWeakShell = weakRef;
+  NS_IF_ADDREF(*aWeakShell);
+
+  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));
+  if (!content || !node)
+    return NS_ERROR_FAILURE;
+  *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;
+}
+
+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<nsISupports> docShellSupports(do_QueryInterface(pcContainer));
+
+  nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(pcContainer));
+  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));
+
+  nsCOMPtr<nsIContent> tempContent;
+  parentPresShell->FindContentForShell(docShellSupports, getter_AddRefs(tempContent));
+
+  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;
+
+  nsCOMPtr<nsIAccessible> newAcc;
+
+  nsCOMPtr<nsIAccessibleProvider> accProv(do_QueryInterface(aNode));
+  if (accProv)  {
+    accProv->GetAccessible(getter_AddRefs(newAcc));
+    if (newAcc) {
+      *_retval = newAcc;
+      NS_ADDREF(*_retval);
+      return NS_OK;
+    }
+  }
+
+  // ---- 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 NS_ERROR_FAILURE; // 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));
+    if (content) {
+      shell = ownerShell;
+      content = ownerContent;
+    }
+    else {
+      doc->GetRootContent(getter_AddRefs(content));
+      nsIFrame* frame = nsnull;
+      shell->GetPrimaryFrameFor(content, &frame);
+      if (!frame)
+        return NS_ERROR_FAILURE;
+      nsCOMPtr<nsIPresContext> presContext;
+      shell->GetPresContext(getter_AddRefs(presContext));
+      CreateRootAccessible(presContext, frame, getter_AddRefs(newAcc));
+      *_retval = newAcc;
+      NS_ADDREF(*_retval);
+
+      return NS_OK;
+
+    }
+  }
+
+  // ---- If still no nsIContent, return ----
+  if (!content)
+    return NS_ERROR_FAILURE;
+
+  // ---- Try using frame to get IAccessible ----
+  nsIFrame* frame = nsnull;
+  shell->GetPrimaryFrameFor(content, &frame);
+  if (!frame)
+    return NS_ERROR_FAILURE;
+
+  frame->GetAccessible(getter_AddRefs(newAcc));
+
+  // ---- 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,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
+ *
+ * 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: David W. Hyatt (hyatt@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 __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);
+  NS_IMETHOD GetShellFromNode(nsIDOMNode *aNode, nsIWeakReference **weakShell);
+  void GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent);
+  nsIContent* FindContentForDocShell(nsIPresShell* aPresShell, nsIContent* aContent, nsIDocShell*  aDocShell);
+
+};
+
+#endif /* __nsIAccessibilityService_h__ */

mozilla/accessible/src/nsAccessible.h

@@ -0,0 +1,151 @@
+/* -*- 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 _nsAccessible_H_
+#define _nsAccessible_H_
+
+#include "nsCOMPtr.h"
+#include "nsGenericAccessible.h"
+#include "nsIAccessible.h"
+#include "nsIDOMNode.h"
+#include "nsIFocusController.h"
+#include "nsIPresContext.h"
+#include "nsIPresShell.h"
+#include "nsPoint.h"
+#include "nsRect.h"
+#include "nsWeakReference.h"
+#include "nsIDOMNodeList.h"
+#include "nsIBindingManager.h"
+
+#define ACCESSIBLE_BUNDLE_URL "chrome://global/locale/accessible.properties"
+
+class nsIContent;
+class nsIDocShell;
+class nsIFrame;
+class nsIWebShell;
+
+enum { eSiblingsUninitialized = -1, eSiblingsWalkNormalDOM = -2};  // Used in sibling index field as flags
+
+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 };
+
+  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 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:
+  NS_IMETHOD AppendLabelText(nsIDOMNode *aLabelNode, nsAWritableString& _retval);
+  NS_IMETHOD AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel);
+  NS_IMETHOD GetHTMLAccName(nsAWritableString& _retval); 
+  NS_IMETHOD GetXULAccName(nsAWritableString& _retval); 
+
+protected:
+  virtual nsIFrame* GetFrame();
+  virtual nsIFrame* GetBoundsFrame();
+  virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
+  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
+  PRBool IsEntirelyVisible(); 
+  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString);
+  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString);
+  NS_IMETHOD AppendStringWithSpaces(nsAWritableString *aFlatString, nsAReadableString& textEquivalent);
+  NS_IMETHOD GetFocusedElement(nsIDOMElement **aFocusedElement);
+  NS_IMETHOD CacheOptimizations(nsIAccessible *aParent, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList);
+
+  // 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)
+};
+
+#endif  

mozilla/accessible/src/nsBaseWidgetAccessible.cpp

@@ -0,0 +1,410 @@
+/* -*- 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, nsAWritableString& _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(nsAWritableString& _retval)
+{
+  return NS_OK;
+}
+
+/** no name*/
+NS_IMETHODIMP nsContainerAccessible::GetAccName(nsAWritableString& _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;
+  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 isSelected = PR_FALSE, isCollapsed = PR_TRUE;
+        domSel->ContainsNode(mDOMNode, PR_TRUE, &isSelected);
+        domSel->GetIsCollapsed(&isCollapsed);
+        if (isSelected && !isCollapsed)
+          *_retval |=STATE_SELECTED;
+      }
+    }
+  }
+
+  // Focused? Do we implement that here or up the chain?
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAWritableString& _retval)
+{
+  if (IsALink()) {
+    nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mLinkContent));
+    if (elt) 
+      return elt->GetAttribute(NS_LITERAL_STRING("href"), _retval);
+  }
+  return NS_ERROR_FAILURE;
+}
+
+
+/* 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, nsAWritableString& _retval)
+{
+  // Action 0 (default action): Jump to link
+  if (index == eAction_Jump) {   
+    if (IsALink()) {
+      _retval = NS_LITERAL_STRING("jump"); 
+      return NS_OK;
+    }
+  }
+  return NS_ERROR_FAILURE;
+}
+
+/* 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_FAILURE;
+}
+
+
+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/nsBaseWidgetAccessible.h

@@ -0,0 +1,148 @@
+/* -*- 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, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _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, 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;
+};
+
+/*
+ * 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/nsFormControlAccessible.cpp

@@ -0,0 +1,226 @@
+/* -*- 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(nsAWritableString& _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, nsAWritableString& _retval)
+{
+  if (index == eAction_Click) {
+    _retval = NS_LITERAL_STRING("select");
+    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/nsFormControlAccessible.h

@@ -0,0 +1,93 @@
+/* -*- 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(nsAWritableString& _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, nsAWritableString& _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/nsGenericAccessible.cpp

@@ -0,0 +1,243 @@
+/* -*- 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 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 "nsGenericAccessible.h"
+#include "nsIFrame.h"
+#include "nsCOMPtr.h"
+#include "nsIWeakReference.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;
+}
+
+NS_IMETHODIMP nsGenericAccessible::CacheOptimizations(nsIAccessible *aParent, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/accessible/src/nsGenericAccessible.h

@@ -0,0 +1,67 @@
+/* -*- 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 _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,169 @@
+/* -*- 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 "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"
+
+
+// --- 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,71 @@
+/* -*- 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 _nsHTMLAreaAccessible_H_
+#define _nsHTMLAreaAccessible_H_
+
+#include "nsBaseWidgetAccessible.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/nsHTMLFormControlAccessible.cpp

@@ -0,0 +1,376 @@
+/* -*- 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 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 ***** */
+
+// 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 "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"
+
+// --- checkbox -----
+
+nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsFormControlAccessible(aNode, aShell)
+{ 
+}
+
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_CHECKBUTTON;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = eSingle_Action;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == eAction_Click) {    // 0 is the magic value for default action
+    // 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;
+}
+
+NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == 0) {   // 0 is the magic value for default action
+    nsCOMPtr<nsIDOMHTMLInputElement> htmlCheckboxElement(do_QueryInterface(mDOMNode));
+    PRBool checked = PR_FALSE;
+    if (htmlCheckboxElement) {
+      htmlCheckboxElement->GetChecked(&checked);
+      htmlCheckboxElement->SetChecked(!checked);
+      return NS_OK;
+    }
+    return NS_ERROR_FAILURE;
+  }
+  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)
+{ 
+}
+
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == eAction_Click) {
+    nsCOMPtr<nsIDOMHTMLInputElement> element(do_QueryInterface(mDOMNode));
+    element->Click();
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccState(PRUint32 *_retval)
+{
+  nsFormControlAccessible::GetAccState(_retval);
+  PRBool checked = PR_FALSE;   // Radio buttons and check boxes can be checked
+
+  nsCOMPtr<nsIDOMHTMLInputElement> htmlRadioElement(do_QueryInterface(mDOMNode));
+  if (htmlRadioElement) 
+    htmlRadioElement->GetChecked(&checked);
+
+  if (checked) 
+    *_retval |= STATE_CHECKED;
+
+  return NS_OK;
+}
+
+// ----- Button -----
+
+nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsFormControlAccessible(aNode, aShell)
+{ 
+}
+
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = eSingle_Action;
+  return NS_OK;;
+}
+
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == eAction_Click) {
+    _retval = NS_LITERAL_STRING("press");
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+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;
+}
+
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PUSHBUTTON;
+  return NS_OK;
+}
+
+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):
+nsBlockAccessible(aNode, aShell)
+{ 
+}
+
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccNumActions(PRUint8 *_retval)
+{
+  *_retval = eSingle_Action;
+  return NS_OK;;
+}
+
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
+{
+  if (index == eAction_Click) {
+    _retval = NS_LITERAL_STRING("press");
+    return NS_OK;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+NS_IMETHODIMP nsHTML4ButtonAccessible::AccDoAction(PRUint8 index)
+{
+  if (index == 0) {
+    nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(mDOMNode));
+    if ( inputElement )
+    {
+      inputElement->Click();
+      return NS_OK;
+    }
+    return NS_ERROR_FAILURE;
+  }
+  return NS_ERROR_INVALID_ARG;
+}
+
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_PUSHBUTTON;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccState(PRUint32 *_retval)
+{
+  nsAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
+  return NS_OK;
+}
+
+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):
+nsFormControlAccessible(aNode, aShell)
+{ 
+}
+
+NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_TEXT;
+  return NS_OK;
+}
+
+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);
+    return NS_OK;
+  }
+  
+  nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(mDOMNode));
+  if (inputElement) {
+    inputElement->GetValue(_retval);
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+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 = nsFormControlAccessible::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,103 @@
+/* -*- 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 _nsHTMLFormControlAccessible_H_
+#define _nsHTMLFormControlAccessible_H_
+
+#include "nsBaseWidgetAccessible.h"
+#include "nsFormControlAccessible.h"
+
+class nsICheckboxControlFrame;
+
+class nsHTMLCheckboxAccessible : public nsFormControlAccessible
+{
+
+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);
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+};
+
+class nsHTMLRadioButtonAccessible : public nsRadioButtonAccessible
+{
+
+public:
+  nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+};
+
+class nsHTMLButtonAccessible : public nsFormControlAccessible
+{
+
+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 nsBlockAccessible
+{
+
+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 nsFormControlAccessible
+{
+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,207 @@
+/* -*- 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):
+ *
+ *
+ * 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 "nsHTMLIFrameRootAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIDOMDocument.h"
+#include "nsReadableUtils.h"
+
+NS_INTERFACE_MAP_BEGIN(nsHTMLIFrameRootAccessible)
+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_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 nsBlockAccessible::QueryInterface(aIID, aInstancePtr); 
+}
+
+
+nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *aDoc):
+  nsBlockAccessible(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 nsAccessible::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):
+  mOuterNode(aNode), nsRootAccessible(aShell)
+{
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+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);
+}
+
+  /* nsIAccessible getAccNextSibling (); */
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccNextSibling(nsIAccessible **_retval) 
+{
+  Init();
+  return mOuterAccessible->GetAccNextSibling(_retval);
+}
+
+NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccPreviousSibling(nsIAccessible **_retval) 
+{
+  Init();
+  return mOuterAccessible->GetAccPreviousSibling(_retval);
+}

mozilla/accessible/src/nsHTMLIFrameRootAccessible.h

@@ -0,0 +1,101 @@
+/* -*- 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):
+ *
+ *
+ * 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 _nsIFrameRootAccessible_H_
+#define _nsIFrameRootAccessible_H_
+
+#include "nsBaseWidgetAccessible.h"
+#include "nsRootAccessible.h"
+#include "nsAccessible.h"
+#include "nsIAccessibleDocument.h"
+
+class nsIWebShell;
+class nsIWeakReference;
+
+class nsHTMLIFrameAccessible : public nsBlockAccessible, 
+                               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:
+    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;
+};
+
+
+#endif  

mozilla/accessible/src/nsHTMLImageAccessible.cpp

@@ -0,0 +1,205 @@
+/* -*- 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 "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, nsIWeakReference* aShell):
+nsLinkableAccessible(aDOMNode, aShell)
+{ 
+  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(aDOMNode));
+  nsCOMPtr<nsIDocument> doc;
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (!shell)
+    return;
+
+  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,71 @@
+/* -*- 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 _nsHTMLImageAccessible_H_
+#define _nsHTMLImageAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsBaseWidgetAccessible.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, 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,79 @@
+/* -*- 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 "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,55 @@
+/* -*- 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 _nsHTMLLinkAccessible_H_
+#define _nsHTMLLinkAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsBaseWidgetAccessible.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/nsHTMLSelectAccessible.cpp

@@ -0,0 +1,589 @@
+/* -*- 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 "nsHTMLSelectAccessible.h"
+#include "nsIAccessibilityService.h"
+#include "nsIFrame.h"
+#include "nsIComboboxControlFrame.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMHTMLOptionElement.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIListControlFrame.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 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
+  *        - nsHTMLSelctListAccessible
+  *           - nsHTMLSelectOptionAccessible
+  *
+  *  Comboboxes:
+  *     - nsHTMLComboboxAccessilbe
+  *        - nsHTMLComboboxTextFieldAccessible
+  *        - nsHTMLComboboxButtonAccessible
+  *        - nsHTMLComboboxWindowAccessilbe
+  *           - nsHTMLSelctListAccessible
+  *              - nsHTMLSelectOptionAccessible
+  */
+
+/** ------------------------------------------------------ */
+/**  First, the common widgets                             */
+/** ------------------------------------------------------ */
+
+/** ----- nsHTMLSelectListAccessible ----- */
+
+/** Default Constructor */
+nsHTMLSelectListAccessible::nsHTMLSelectListAccessible(nsIAccessible* aParent, 
+                                                       nsIDOMNode* aDOMNode, 
+                                                       nsIWeakReference* aShell)
+:nsSelectListAccessible(aParent, aDOMNode, aShell)
+{
+}
+
+/**
+  * As a nsHTMLSelectListAccessible we can have the following states:
+  *     STATE_MULTISELECTABLE
+  *     STATE_EXTSELECTABLE
+  */
+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;
+}
+
+/**
+  * Gets the last child of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
+  */
+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;
+}
+
+/**
+  * Gets the First child of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
+  */
+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 ----- */
+
+/** Default Constructor */
+nsHTMLSelectOptionAccessible::nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsSelectOptionAccessible(aParent, aDOMNode, aShell)
+{
+}
+
+/**
+  * Gets the next sibling of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
+  */
+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;
+} 
+
+/**
+  * Gets the previous sibling of the DOM node and creates and returns
+  *  a nsHTMLSelectOptionAccessible.
+  */
+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;
+} 
+
+/**
+  * 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)
+{
+  *_retval = 0;
+  nsCOMPtr<nsIDOMNode> focusedOptionNode, parentNode;
+  mParent->AccGetDOMNode(getter_AddRefs(parentNode));
+  // find out if we are the focused node
+  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;
+}
+
+/**
+  * Helper method for getting the focused DOM Node from our parent(list) node. We
+  *  need to use the frame to get the focused option because for some reason we
+  *  weren't getting the proper notification when the focus changed using the DOM
+  */
+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". 
+  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;
+}
+
+/** ------------------------------------------------------ */
+/**  Secondly, the Listbox widget                          */
+/** ------------------------------------------------------ */
+
+/** ----- nsHTMLListboxAccessible ----- */
+
+/** Constructor */
+nsHTMLListboxAccessible::nsHTMLListboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsListboxAccessible(aDOMNode, aShell)
+{
+}
+
+/** Inherit the ISupports impl from nsAccessible, we handle nsIAccessibleSelectable */
+NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLListboxAccessible, nsListboxAccessible, nsIAccessibleSelectable)
+
+/** 
+  * Our last (and only) child is an nsHTMLSelectListAccessible 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;
+}
+
+/** 
+  * Our first (and only) child is an nsHTMLSelectListAccessible 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;
+}
+
+/**
+  * Our value is the value of our ( first ) selected child. nsIDOMHTMLSelectElement
+  *     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;
+}
+
+/**
+  * 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 selectd 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 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;
+}
+
+/** ------------------------------------------------------ */
+/**  Finally, the Combobox widgets                         */
+/** ------------------------------------------------------ */
+
+/** ----- nsHTMLComboboxAccessible ----- */
+
+/** Constructor */
+nsHTMLComboboxAccessible::nsHTMLComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell):
+nsComboboxAccessible(aDOMNode, aShell)
+{
+}
+
+/** 
+  * Our last child is an 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;
+}
+
+/** 
+  * Our last child is an 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;
+}
+
+/**
+  * Our value is the value of our ( first ) selected child. nsIDOMHTMLSelectElement
+  *     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;
+}
+
+/** ----- nsHTMLComboboxTextFieldAccessible ----- */
+
+/** Constructor */
+nsHTMLComboboxTextFieldAccessible::nsHTMLComboboxTextFieldAccessible(nsIAccessible* aParent, 
+                                                                 nsIDOMNode* aDOMNode, 
+                                                                 nsIWeakReference* aShell):
+nsComboboxTextFieldAccessible(aParent, aDOMNode, aShell)
+{
+}
+
+/**
+  * Our next sibling is an 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;
+} 
+
+/** -----ComboboxButtonAccessible ----- */
+
+/** Constructor -- cache our parent */
+nsHTMLComboboxButtonAccessible::nsHTMLComboboxButtonAccessible(nsIAccessible* aParent, 
+                                                           nsIDOMNode* aDOMNode, 
+                                                           nsIWeakReference* aShell):
+nsComboboxButtonAccessible(aParent, aDOMNode, aShell)
+{
+}
+
+/**
+  * 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;
+}
+
+/**
+  * Our next sibling is an 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;
+} 
+
+/**
+  * Our next sibling is an 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;
+} 
+
+/** ----- nsHTMLComboboxWindowAccessible ----- */
+
+/**
+  * Constructor -- cache our parent
+  */
+nsHTMLComboboxWindowAccessible::nsHTMLComboboxWindowAccessible(nsIAccessible* aParent, 
+                                                           nsIDOMNode* aDOMNode, 
+                                                           nsIWeakReference* aShell):
+nsComboboxWindowAccessible(aParent, aDOMNode, aShell)
+{
+}
+ 
+/**
+  * Our previous sibling is 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 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;
+}
+

mozilla/accessible/src/nsHTMLSelectAccessible.h

@@ -0,0 +1,209 @@
+/* -*- 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 __nsHTMLSelectAccessible_h__
+#define __nsHTMLSelectAccessible_h__
+
+#include "nsCOMPtr.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
+  *        - nsHTMLSelctListAccessible
+  *           - nsHTMLSelectOptionAccessible
+  *
+  *  Comboboxes:
+  *     - nsHTMLComboboxAccessilbe
+  *        - nsHTMLComboboxTextFieldAccessible
+  *        - nsHTMLComboboxButtonAccessible
+  *        - nsHTMLComboboxWindowAccessilbe
+  *           - 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 GetAccFirstChild(nsIAccessible **_retval);
+
+};
+
+/*
+ * 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(nsIWeakReference *aPresShell, nsIDOMNode *aListNode, nsCOMPtr<nsIDOMNode>& aFocusedOptionNode);
+
+};
+
+/** ------------------------------------------------------ */
+/**  Secondly, the Listbox widget                          */
+/** ------------------------------------------------------ */
+
+/*
+ * A class the represents the HTML Listbox widget.
+ */
+class nsHTMLListboxAccessible : public nsListboxAccessible,
+                                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 GetAccValue(nsAWritableString& _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(nsAWritableString& _retval);
+
+};
+
+/*
+ * A class the represents the text field in the Select to the left
+ *     of the drop down button
+ */
+class nsHTMLComboboxTextFieldAccessible  : public nsComboboxTextFieldAccessible
+{
+public:
+  
+  nsHTMLComboboxTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsHTMLComboboxTextFieldAccessible() {}
+
+  /* ----- 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 GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+
+};
+
+/*
+ * 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/nsHTMLTableAccessible.cpp

@@ -0,0 +1,67 @@
+/* -*- 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 "nsHTMLTableAccessible.h"
+#include "nsWeakReference.h"
+#include "nsReadableUtils.h"
+
+nsHTMLTableCellAccessible::nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsBlockAccessible(aDomNode, aShell)
+{ 
+}
+
+/* unsigned long getAccRole (); */
+NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccRole(PRUint32 *_retval)
+{
+  *_retval = ROLE_CELL;
+  return NS_OK;
+}
+
+nsHTMLTableAccessible::nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsBlockAccessible(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,61 @@
+/* -*- 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 _nsHTMLTableAccessible_H_
+#define _nsHTMLTableAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsBaseWidgetAccessible.h"
+
+class nsHTMLTableCellAccessible : public nsBlockAccessible
+{
+public:
+  nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+};
+
+
+class nsHTMLTableAccessible : public nsBlockAccessible
+{
+public:
+  nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+};
+
+#endif  

mozilla/accessible/src/nsHTMLTextAccessible.cpp

@@ -0,0 +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
+ *
+ * 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 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 "nsHTMLTextAccessible.h"
+
+nsHTMLTextAccessible::nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsTextAccessible(aDomNode, aShell)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval)
+{ 
+  return mDOMNode->GetNodeValue(_retval);
+}

mozilla/accessible/src/nsHTMLTextAccessible.h

@@ -0,0 +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
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _nsHTMLTextAccessible_H_
+#define _nsHTMLTextAccessible_H_
+
+#include "nsFormControlAccessible.h"
+
+class nsIWeakReference;
+
+class nsHTMLTextAccessible : public nsTextAccessible
+{
+
+public:
+  nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+};
+
+#endif  

mozilla/accessible/src/nsRootAccessible.cpp

@@ -0,0 +1,587 @@
+/* -*- 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):
+ *
+ *
+ * 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 "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 "nsIDOMEventReceiver.h"
+#include "nsIDOMEventListener.h"
+#include "nsReadableUtils.h"
+#include "nsILink.h"
+#include "nsHTMLFormControlAccessible.h"
+#include "nsHTMLLinkAccessible.h"
+#include "nsIURI.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIWebNavigation.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 "nsHTMLSelectAccessible.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIWebProgress.h"
+#include "nsCURILoader.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsIScriptGlobalObject.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)
+
+
+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")),
+  mBusy(eBusyStateUninitialized)
+{
+  mListener = nsnull;
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+  if (shell) {
+    shell->GetDocument(getter_AddRefs(mDocument));
+    mDOMNode = do_QueryInterface(mDocument);
+
+    nsLayoutAtoms::AddRefAtoms();
+  }
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsRootAccessible::~nsRootAccessible()
+{
+  nsLayoutAtoms::ReleaseAtoms();
+  RemoveAccessibleEventListener();
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsRootAccessible::GetAccName(nsAWritableString& aAccName) 
+{ 
+  return GetTitle(aAccName);
+}
+
+// helpers
+nsIFrame* nsRootAccessible::GetFrame()
+{
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+
+  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)
+{
+  *aAccState = STATE_FOCUSABLE;
+  if (mBusy == eBusyStateLoading)
+    *aAccState |= STATE_BUSY;
+  return NS_OK;
+}
+
+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);
+  }
+}
+
+NS_IMETHODIMP nsRootAccessible::StartDocReadyTimer()
+{
+  nsresult rv;
+  if (!mTimer) {
+    mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
+    if (NS_SUCCEEDED(rv)) {
+      const PRUint32 kUpdateTimerDelay = 1;
+      rv = mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this), kUpdateTimerDelay);
+    }
+  }
+
+  return rv;
+}
+
+/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (mListener)
+    return NS_OK;
+
+  mListener =  aListener;
+
+  // 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));
+  if (!document)
+    return NS_ERROR_FAILURE;
+
+  // use AddEventListener from the nsIDOMEventTarget interface
+  nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(document));
+  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");
+    rv = target->AddEventListener(NS_LITERAL_STRING("blur"), 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 RadiobuttonStateChange listener (custom event fired in nsHTMLInputElement.cpp)
+    rv = target->AddEventListener(NS_LITERAL_STRING("RadiobuttonStateChange"), NS_STATIC_CAST(nsIDOMFormListener*, this), PR_TRUE);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+
+    // Extremely short timer, after which we announce that pane 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(); 
+  }
+
+  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));
+      if (container) {
+        nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
+        if (docShell) {
+          nsCOMPtr<nsIWebProgress> webProgress(do_GetInterface(docShell));
+          if (webProgress) {
+            webProgress->AddProgressListener(this);
+          }
+        }
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+/* void removeAccessibleEventListener (); */
+NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener()
+{
+  if (mListener) {
+    nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
+    nsCOMPtr<nsIDocument> document;
+    if (shell) {
+      shell->GetDocument(getter_AddRefs(document));
+      nsCOMPtr<nsIDOMEventReceiver> eventReceiver(do_QueryInterface(document));
+      if (eventReceiver) {
+        nsresult rv = eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to unregister listener");
+        rv = eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFormListener *, this), NS_GET_IID(nsIDOMFormListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to unregister 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);
+}
+
+NS_IMETHODIMP nsRootAccessible::OnStateChange(nsIWebProgress *aWebProgress,
+  nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 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)
+{
+  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)
+{
+  return NS_OK;
+}
+
+/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long state); */
+NS_IMETHODIMP nsRootAccessible::OnSecurityChange(nsIWebProgress *aWebProgress,
+  nsIRequest *aRequest, PRInt32 state)
+{
+  return NS_OK;
+}
+
+nsDocAccessibleMixin::nsDocAccessibleMixin(nsIDocument *aDoc):mDocument(aDoc)
+{
+}
+
+nsDocAccessibleMixin::nsDocAccessibleMixin(nsIWeakReference *aPresShell)
+{
+  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(aPresShell));
+  if (shell)
+    shell->GetDocument(getter_AddRefs(mDocument));
+}
+
+nsDocAccessibleMixin::~nsDocAccessibleMixin()
+{
+}
+
+NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAWritableString& aURL)
+{ 
+  nsCOMPtr<nsIPresShell> presShell;
+  mDocument->GetShellAt(0, getter_AddRefs(presShell));
+  NS_ASSERTION(presShell,"Shell is gone!!! What are we doing here?");
+
+  nsCOMPtr<nsIDocShell> docShell;
+  GetDocShellFromPS(presShell, getter_AddRefs(docShell));
+
+  nsCOMPtr<nsIWebNavigation> webNav(do_GetInterface(docShell));
+  nsXPIDLCString theURL;
+  if (webNav) {
+    nsCOMPtr<nsIURI> pURI;
+    webNav->GetCurrentURI(getter_AddRefs(pURI));
+    if (pURI) 
+      pURI->GetSpec(getter_Copies(theURL));
+  }
+  //XXXaaronl Need to use CopyUTF8toUCS2(nsDependentCString(theURL), aURL); when it's written
+  aURL.Assign(NS_ConvertUTF8toUCS2(theURL).get()); 
+  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)
+{
+  nsCOMPtr<nsIDOMNSDocument> domnsDocument(do_QueryInterface(mDocument));
+  if (domnsDocument) {
+    return domnsDocument->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::GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell)
+{
+  *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;
+      }
+    }
+  }
+  return NS_ERROR_FAILURE;
+}

mozilla/accessible/src/nsRootAccessible.h

@@ -0,0 +1,140 @@
+/* -*- 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):
+ *
+ *
+ * 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 _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"
+#include "nsIWebProgressListener.h"
+#include "nsIWeakReference.h"
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+
+
+class nsDocAccessibleMixin
+{
+  public:
+    nsDocAccessibleMixin(nsIDocument *doc);
+    nsDocAccessibleMixin(nsIWeakReference *aShell);
+    virtual ~nsDocAccessibleMixin();
+    
+    NS_DECL_NSIACCESSIBLEDOCUMENT
+
+  protected:
+    NS_IMETHOD GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
+    PRBool mTopLevelDocument;
+    nsCOMPtr<nsIDocument> mDocument;
+};
+
+class nsRootAccessible : public nsAccessible,
+                         public nsDocAccessibleMixin,
+                         public nsIAccessibleDocument,
+                         public nsIAccessibleEventReceiver,
+                         public nsIDOMFocusListener,
+                         public nsIDOMFormListener,
+                         public nsIWebProgressListener,
+                         public nsITimerCallback, 
+                         public nsSupportsWeakReference
+
+
+{
+  NS_DECL_ISUPPORTS_INHERITED
+
+  public:
+    enum EBusyState {eBusyStateUninitialized, eBusyStateLoading, eBusyStateDone};
+
+    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();
+
+    // ----- nsIDOMEventListener --------------------------
+    NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
+
+    // ----- 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_IMETHOD_(void) Notify(nsITimer *timer);
+    NS_IMETHOD StartDocReadyTimer();
+
+    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();
+
+    // mListener is 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;
+
+    nsCOMPtr<nsITimer> mTimer;
+    nsCOMPtr<nsIDOMNode> mCurrentFocus;
+    nsCOMPtr<nsIAccessibilityService> mAccService;
+    EBusyState mBusy;
+};
+
+
+#endif  

mozilla/accessible/src/nsSelectAccessible.cpp

@@ -0,0 +1,680 @@
+/* -*- 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 "nsIDOMHTMLSelectElement.h"
+#include "nsIFrame.h"
+#include "nsIListControlFrame.h"
+#include "nsISelectControlFrame.h"
+#include "nsLayoutAtoms.h"
+#include "nsRootAccessible.h"
+#include "nsSelectAccessible.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)
+{
+  mParent = aParent;
+}
+
+/** 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(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;
+}
+
+/** ------------------------------------------------------ */
+/**  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(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 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;
+
+  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);
+}
+
+/** 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(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.
+  * Uses the frame to get the state, updated on every click
+  */
+NS_IMETHODIMP nsComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _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)
+    _retval = NS_LITERAL_STRING("Close");
+  else
+    _retval = NS_LITERAL_STRING("Open");
+
+  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);
+#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/nsSelectAccessible.h

@@ -0,0 +1,237 @@
+/* -*- 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 GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _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(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 nsComboboxButtonAccessible  : public nsLeafAccessible
+{
+public:
+
+  nsComboboxButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
+  virtual ~nsComboboxButtonAccessible() {}
+
+  /* ----- nsIAccessible ----- */
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval);
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _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/nsXULFormControlAccessible.cpp

@@ -0,0 +1,212 @@
+/* -*- 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 "nsIDOMXULSelectCntrlEl.h"
+#include "nsIDOMXULSelectCntrlItemEl.h"
+#include "nsReadableUtils.h"
+#include "nsString.h"
+#include "nsXULFormControlAccessible.h"
+
+/**
+  * XUL Button: can contain arbitrary HTML content
+  */
+
+/**
+  * Default Constructor
+  */
+nsXULButtonAccessible::nsXULButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
+nsFormControlAccessible(aNode, aShell)
+{ 
+}
+
+/**
+  * 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, nsAWritableString& _retval)
+{
+  if (index == eAction_Click) {
+    _retval = NS_LITERAL_STRING("press");
+    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
+  nsFormControlAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
+  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, nsAWritableString& _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
+  PRBool checked = PR_FALSE;
+
+  nsCOMPtr<nsIDOMXULCheckboxElement> xulCheckboxElement(do_QueryInterface(mDOMNode));
+  if (xulCheckboxElement)
+      xulCheckboxElement->GetChecked(&checked);
+
+  if (checked) 
+    *_retval |= STATE_CHECKED;
+  
+  return NS_OK;
+}
+

mozilla/accessible/src/nsXULFormControlAccessible.h

@@ -0,0 +1,71 @@
+/* -*- 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 nsFormControlAccessible
+{
+public:
+  nsXULButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
+  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+};
+
+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, nsAWritableString& _retval);
+  NS_IMETHOD AccDoAction(PRUint8 index);
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+};
+
+#endif  
+

mozilla/accessible/src/nsXULTextAccessible.cpp

@@ -0,0 +1,62 @@
+/* -*- 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 "nsIDOMXULDescriptionElement.h"
+#include "nsWeakReference.h"
+#include "nsXULTextAccessible.h"
+
+/**
+  * For XUL descriptions and labels
+  */
+nsXULTextAccessible::nsXULTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
+nsTextAccessible(aDomNode, aShell)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsXULTextAccessible::GetAccName(nsAWritableString& _retval)
+{ 
+  nsCOMPtr<nsIDOMXULDescriptionElement> descriptionElement(do_QueryInterface(mDOMNode));
+  if (descriptionElement) {
+    nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
+    return AppendFlatStringFromSubtree(content, &_retval);
+  }
+  return NS_ERROR_FAILURE;
+}

mozilla/accessible/src/nsXULTextAccessible.h

@@ -0,0 +1,55 @@
+/* -*- 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 _nsXULTextAccessible_H_
+#define _nsXULTextAccessible_H_
+
+#include "nsFormControlAccessible.h"
+
+class nsIWeakReference;
+
+class nsXULTextAccessible : public nsTextAccessible
+{
+
+public:
+  nsXULTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
+};
+
+#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

@@ -45,14 +45,11 @@
 #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
@@ -61,18 +58,11 @@
 /**
   * 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"))
+nsFormControlAccessible(aNode, aShell)
 { 
 }
 
-NS_IMETHODIMP nsXULButtonAccessible::GetAccName(nsAString& aResult)
-{
-  return GetXULAccName(aResult);
-}
-
 /**
   * Only one actions available
   */
@@ -85,10 +75,10 @@ NS_IMETHODIMP nsXULButtonAccessible::GetAccNumActions(PRUint8 *_retval)
 /**
   * Return the name of our only action
   */
-NS_IMETHODIMP nsXULButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsXULButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   if (index == eAction_Click) {
-    nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); 
+    _retval = NS_LITERAL_STRING("press");
     return NS_OK;
   }
   return NS_ERROR_INVALID_ARG;
@@ -126,173 +116,8 @@ NS_IMETHODIMP nsXULButtonAccessible::GetAccRole(PRUint32 *_retval)
 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;
-
+  nsFormControlAccessible::GetAccState(_retval);
+  *_retval |= STATE_FOCUSABLE;
   return NS_OK;
 }
 
@@ -329,7 +154,7 @@ NS_IMETHODIMP nsXULCheckboxAccessible::GetAccNumActions(PRUint8 *_retval)
 /**
   * Return the name of our only action
   */
-NS_IMETHODIMP nsXULCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval)
+NS_IMETHODIMP nsXULCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
 {
   if (index == eAction_Click) {
     // check or uncheck
@@ -373,194 +198,15 @@ NS_IMETHODIMP nsXULCheckboxAccessible::GetAccState(PRUint32 *_retval)
   nsFormControlAccessible::GetAccState(_retval);
 
   // Determine Checked state
+  PRBool checked = PR_FALSE;
+
   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;
-    }
-  }
+  if (xulCheckboxElement)
+      xulCheckboxElement->GetChecked(&checked);
+
+  if (checked) 
+    *_retval |= STATE_CHECKED;
   
   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

@@ -45,24 +45,15 @@
 #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
+class nsXULButtonAccessible : public nsFormControlAccessible
 {
 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 GetAccActionName(PRUint8 index, nsAWritableString& _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
@@ -71,66 +62,10 @@ 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 GetAccActionName(PRUint8 index, nsAWritableString& _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