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/LEGAL

@@ -0,0 +1,43 @@
+Please be apprised of the following Legal Notices:
+
+A) The U.S. District Court for the Eastern District of Virginia has
+ruled that the Netscape Navigator code does not infringe Wang's U.S.
+Patent No. 4,751,669 ("the '669 Patent") because: 1) HTML is not
+Videotex as defined by the '669 patent; 2) web servers are not central
+suppliers; and 3) Navigator does not "connect," as defined by the '669
+Patent, to web servers on the Internet. Wang may appeal this decision to
+the Federal Circuit. Wang contended that its Patent disclosing a
+"Videotext" system, is infringed by the following functionality in the
+Netscape Navigator code: 1) the animated logo and status line indicators
+--See Claims 1,8 and 9; 2)  the "File Save As" function --See Claims
+23-27; 3) Bookmarks and Rename Bookmarks in the Properties window --See
+Claims 20-22; 4) storing HTML, GIF, and JPEG files and adding filename
+extensions --See Claim 38
+
+B)   Intermind owns pending U.S. patent applications on communications
+systems which employ metadata ("channel objects") to define a control
+structure for information transfer.  The Netscape code does not infringe
+as released; however, modifications which utilize channel objects as
+described by Intermind should be considered carefully. The following is
+a statement from Intermind:  "Intermind's claims fundamentally involve
+the use of a control structure to automate communications. ...The
+essence of Intermind's top claim is that two devices sender and
+receiver have persistent storage, communicate over a network,
+and exchange a control structure including metadata which describes: 1)
+what information is to be updated, 2) when to update this information,
+and 3) how to transfer the updated information. In addition, at  least
+the receiving device must be able to process the metadata in order to
+perform the update determination and transfer. Any digital
+communications system which incorporates all of these elements will be
+covered by Intermind's patents."  See Intermind.com.
+
+C) Stac, Inc., and its licensing agent Hi/fn, own several patents which
+disclose data compression methods implementing an LZS compression
+algorithm, including U.S. Patent Nos.  4,701,745 and 5,016, 009 ("the
+Stac Patents").  The Netscape Communicator code  does not perform
+compression. If you modify the Netscape source code to perform
+compression, please take notice of the Stac Patents.
+
+D) Netscape Communications Corporation ("Netscape") does not guarantee
+that any source code or executable code available from the mozilla.org
+domain is Year 2000 compliant.

mozilla/LICENSE

@@ -0,0 +1,567 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+     ----------------------------------------------------------------------
+
+     AMENDMENTS
+
+     The Netscape Public License Version 1.1 ("NPL") consists of the
+     Mozilla Public License Version 1.1 with the following Amendments,
+     including Exhibit A-Netscape Public License.  Files identified with
+     "Exhibit A-Netscape Public License" are governed by the Netscape
+     Public License Version 1.1.
+
+     Additional Terms applicable to the Netscape Public License.
+          I. Effect.
+          These additional terms described in this Netscape Public
+          License -- Amendments shall apply to the Mozilla Communicator
+          client code and to all Covered Code under this License.
+
+          II. "Netscape's Branded Code" means Covered Code that Netscape
+          distributes and/or permits others to distribute under one or more
+          trademark(s) which are controlled by Netscape but which are not
+          licensed for use under this License.
+
+          III. Netscape and logo.
+          This License does not grant any rights to use the trademarks
+          "Netscape", the "Netscape N and horizon" logo or the "Netscape
+          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
+          "Smart Browsing" even if such marks are included in the Original
+          Code or Modifications.
+
+          IV. Inability to Comply Due to Contractual Obligation.
+          Prior to licensing the Original Code under this License, Netscape
+          has licensed third party code for use in Netscape's Branded Code.
+          To the extent that Netscape is limited contractually from making
+          such third party code available under this License, Netscape may
+          choose to reintegrate such code into Covered Code without being
+          required to distribute such code in Source Code form, even if
+          such code would otherwise be considered "Modifications" under
+          this License.
+
+          V. Use of Modifications and Covered Code by Initial Developer.
+               V.1. In General.
+               The obligations of Section 3 apply to Netscape, except to
+               the extent specified in this Amendment, Section V.2 and V.3.
+
+               V.2. Other Products.
+               Netscape may include Covered Code in products other than the
+               Netscape's Branded Code which are released by Netscape
+               during the two (2) years following the release date of the
+               Original Code, without such additional products becoming
+               subject to the terms of this License, and may license such
+               additional products on different terms from those contained
+               in this License.
+
+               V.3. Alternative Licensing.
+               Netscape may license the Source Code of Netscape's Branded
+               Code, including Modifications incorporated therein, without
+               such Netscape Branded Code becoming subject to the terms of
+               this License, and may license such Netscape Branded Code on
+               different terms from those contained in this License.
+
+          VI. Litigation.
+          Notwithstanding the limitations of Section 11 above, the
+          provisions regarding litigation in Section 11(a), (b) and (c) of
+          the License shall apply to all disputes relating to this License.
+
+     EXHIBIT A-Netscape Public License.
+
+          "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 Communicator client code, released
+          March 31, 1998.
+
+          The Initial Developer of the Original Code is Netscape
+          Communications Corporation. Portions created by Netscape are
+          Copyright (C) 1998-1999 Netscape Communications Corporation. All
+          Rights Reserved.
+
+          Contributor(s): ______________________________________.
+
+          Alternatively, the contents of this file may be used under the
+          terms of the _____ license (the "[___] License"), in which case
+          the provisions of [______] License are applicable  instead of
+          those above.  If you wish to allow use of your version of this
+          file only under the terms of the [____] License and not to allow
+          others to use your version of this file under the NPL, indicate
+          your decision by deleting  the provisions above and replace  them
+          with the notice and other provisions required by the [___]
+          License.  If you do not delete the provisions above, a recipient
+          may use your version of this file under either the NPL or the
+          [___] License."

mozilla/Makefile.in

@@ -0,0 +1,258 @@
+#
+# 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): 
+#
+
+DEPTH		= .
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/build/unix/modules.mk
+
+ifneq ($(BUILD_MODULES),all)
+
+DIRS		= $(BUILD_MODULE_DIRS)
+EXPORT_DIRS	= $(BUILD_MODULE_DEP_DIRS)
+
+else
+
+#
+# And now for something completely different...
+# Divide the default build into tiers. 
+# Tiers must be defined on module boundaries 
+#
+default: 
+	$(MAKE) nspr
+	$(MAKE) tier_0
+	$(MAKE) tier_1
+	$(MAKE) tier_9
+
+# Make sure that the existing rulesets work
+DIRS = $(NSPRPUB_DIR) $(tier_0_dirs) $(tier_1_dirs) $(tier_9_dirs)
+
+#
+# tier 0 - base build config dirs
+# 
+tier_0_dirs = \
+	config \
+	build \
+	include \
+	$(NULL)
+
+#
+# tier 1 - base libraries
+# 
+tier_1_dirs = js
+
+# MacOSX needs to build lib for MoreFiles before xpcom
+ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
+tier_1_dirs += lib/mac/MoreFiles
+endif
+
+# intl should not be in here - it's just temporary until
+# xpconnect's dependency on intl is repaired - see bug 106130
+tier_9_dirs += \
+	modules/libreg \
+	string \
+	xpcom \
+	intl \
+	$(NULL)
+
+ifndef MOZ_NATIVE_ZLIB
+tier_9_dirs	+= modules/zlib
+endif
+
+# Linux and Solaris installer needs standalone libjar, hence standalone zlib
+ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+tier_9_dirs	+= modules/zlib/standalone
+endif
+
+tier_9_dirs	+= \
+	modules/libjar \
+	$(NULL)
+
+#
+# tier 9 - mozilla application
+#
+ifdef MOZ_JAVA_SUPPLEMENT
+tier_9_dirs += 			\
+  java/util			\
+  java/webclient		\
+  $(NULL)
+endif
+
+ifndef MOZ_NATIVE_JPEG
+tier_9_dirs	+= jpeg
+endif
+
+tier_9_dirs	+= dbm js/src/xpconnect
+
+ifdef MOZ_OJI
+tier_9_dirs	+= js/src/liveconnect
+endif
+
+ifdef MOZ_JSDEBUGGER
+tier_9_dirs	+= js/jsd
+endif
+
+ifdef MOZ_ENABLE_XLIB
+tier_9_dirs	+= gfx/src/xlibrgb widget/src/xlibxtbin
+endif
+
+ifdef MOZ_ENABLE_GTK
+tier_9_dirs	+= widget/src/gtksuperwin widget/src/gtkxtbin
+endif
+
+tier_9_dirs	+= \
+		widget/timer \
+		modules/libutil \
+		netwerk \
+		modules/mpfilelocprovider \
+		uriloader \
+		modules/libpref \
+		modules/libimg \
+		modules/oji \
+		caps \
+		rdf \
+		expat \
+		htmlparser \
+		gfx \
+		gfx2 \
+		modules/libpr0n \
+		modules/plugin \
+		dom \
+		view \
+		widget \
+		content \
+		layout \
+		db \
+		docshell \
+		webshell \
+		embedding \
+		editor \
+		sun-java \
+		profile \
+		themes \
+		$(NULL)
+
+ifdef ACCESSIBILITY
+tier_9_dirs    += accessible
+endif
+
+# This must preceed xpfe
+ifdef MOZ_JPROF
+tier_9_dirs        += tools/jprof
+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
+
+ifdef ENABLE_TESTS
+tier_9_dirs	+= xpcom/tests
+endif
+
+ifdef NS_TRACE_MALLOC
+tier_9_dirs	+= tools/trace-malloc
+endif
+
+tier_9_dirs	+= l10n
+
+ifneq (,$(MOZ_STATIC_COMPONENTS)$(MOZ_META_COMPONENTS))
+tier_9_dirs   += modules/staticmod
+endif
+
+tier_9_dirs	+= xpfe/bootstrap
+
+endif # BUILD_MODULES == all
+
+STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
+
+ifdef MOZ_PSM
+STATIC_MAKEFILES += security/nss 
+endif
+
+GARBAGE_DIRS += dist
+DIST_GARBAGE = config.cache config.log config.status config-defs.h \
+   dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
+   unallmakefiles \
+   $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out 
+
+include $(topsrcdir)/config/rules.mk
+
+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 install; \
+	done
+#
+# Individual modules
+#
+boehm:
+ifdef GC_LEAK_DETECTOR
+	$(MAKE) -C gc/boehm
+endif
+
+nspr: boehm
+ifdef NSPRPUB_DIR
+	$(MAKE) -C $(NSPRPUB_DIR)
+endif
+
+# For modules.mk standalone build
+export::
+	+$(LOOP_OVER_EXPORT_DIRS)
+
+export::
+	@$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include
+
+distclean::
+	cat unallmakefiles | $(XARGS) rm -f
+	rm -f unallmakefiles $(DIST_GARBAGE)
+
+

mozilla/README/IBMChangeLog

@@ -0,0 +1,2 @@
+Pursuant to section 3.3 of the MPL, this file will contain a list of the files
+that have been modified by IBM Corporation.

mozilla/README/mozilla/README.build

@@ -0,0 +1,3 @@
+For mozilla-the-client build instructions, please read:
+http://www.mozilla.org/build/
+

mozilla/accessible/Makefile.in

@@ -0,0 +1,32 @@
+#
+# 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): 
+#
+
+DEPTH   = ..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS    = public src build
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/accessible-docs.html

@@ -0,0 +1,190 @@
+<html>
+<head>
+<title>
+  How the Accessible Module works
+</title>
+</head>
+<body>
+<h1>How the Accessible module (accessibility.dll) works</h1>
+<ul>
+<p>
+See also: 
+<a href="http://www.mozilla.org/projects/ui/accessibility/vendors-win.html">Gecko Info for Windows Accessibility Vendors</a>, a primer for vendors of 3rd party accessibility software, on how to use our MSAA and other relevant API's.
+</p>
+<p>
+The <a href="http://lxr.mozilla.org/seamonkey/source/accessible/">Accessible module</a> is where we implement support for the <a href="http://www.microsoft.com/enable/msaa/">Microsoft Active Accessibility (MSAA) API</a> 
+(<a href="http://bugzilla.mozilla.org/show_bug.cgi?id=12952">bug 12952</a>). 
+Support for Sun's <a href="http://www.sun.com/access/gnome/">Gnome Accessibility API</a> is part of our future plans as well.
+</p>
+</ul>
+<h2>What is MSAA?</h2>
+<ul>
+<p>
+A 3rd part accessibility aid, such as a screen reader, wants to track what's happening inside Mozilla. It needs to know about
+focus changes and other events, and it needs to know whtat data nodes there are in the layout tree. 
+Using this information,
+the screen reader will speak out loud important changes to the document or UI, and allow the user to track
+where they navigate. Some screen readers also magnify text and images in the currently focused area, and others
+show information on a <a href="http://www.audiodata.de/e/produkte/pc/lapbraille/">refreshable braille display</a>.
+</p>
+<p>
+In Windows, accesibility aids acquires the necessary information to do this using hacks and MSAA. MSAA is supposed 
+to be the "right way" for accessibility aids to get information, but sometimes the hacks are more effective.
+For example, screen readers look for screen draws of a vertical blinking line, to determine the location of the caret.
+Without doing this, screen readers would not be able to let the user know where there caret has moved to in most programs,
+because so many applications do not use the system caret (ours is an example). This is so commonly done, that 
+no one even bothers to support the MSAA caret, because the hack works.
+</p>
+<p>
+MSAA provides information in two different ways: 
+<ol>
+<li>a COM interface (IAccessible) that allows applications to expose the tree of data nodes that make up 
+each window in the user interface currently being interacted with and</li>
+<li> a set of system messages
+ that confer accessibility-related events such as focus changes, changes to document content and alerts.</li>
+ </ol>
+</p>
+<p>
+To really learn about MSAA, you need to download
+the entire <a href="http://www.microsoft.com/enable/msaa/download.htm">MSAA SDK</a>. 
+Without downloading the SDK, you won't get the complete documentation.
+The SDK also contains some very useful tools, such as the Accessible Event Watcher, which shows what accessible 
+events are being generated by a given piece of software. The Accessible Explorer and Inspect Object tools 
+show the tree of data nodes the Accessible object is exposing through COM.
+</p>
+</ul>
+<h2>IAccessible Interface</h2>
+<ul>
+<p>
+The IAccessible interface is used in a tree of IAccessible's, each one representing a data node, similar to a DOM.
+</p>
+<p>
+Here are the methods supported in IAccessible:
+<ul>
+    <li>get_accParent: Get the parent of an IAccessible.</li>
+    <li>get_accChildCount: Get the number of children of an IAccesible.</li>
+    <li>get_accChild: Get the child of an Iaccessible.</li>
+    <li>get_accName: Get the "name" of the IAccessible, for example the name of a button, checkbox or menuitem.</li>
+    <li>get_accValue: Get the "value" of the IAccessible, for example a number in a slider, a URL for a link, the text a user entered in a field.</li>
+    <li>get_accDescription: Get a long description of the current IAccessible. This is not really too useful.</li>
+    <li>get_accRole: Get an enumerated value representing what this IAccessible is used for, for example.</li>
+	  is it a link, static text, editable text, a checkbox, or a table cell, etc.</li>
+    <li>get_accState: a 32 bit field representing possible on/off states, such as focused, fousable, selected, selectable, visible, protected (for passwords), 
+checked, etc. </li>
+    <li>get_accHelp: Get context sensitive help for the IAccessible.</li>
+    <li>get_accHelpTopic: We don't use this, it's only if the Windows help system is used.</li>
+    <li>get_accKeyboardShortcut: What is the keyboard shortcut for this IAccessible.</li>
+    <li>get_accFocus: Which child is focused?</li>
+    <li>get_accSelection: Which children of this item are selected?</li>
+    <li>get_accDefaultAction: Get a description or name of the default action for this component, such as "jump" for links.</li>
+
+    <li>accSelect: Select the item associated with this IAccessible.</li>
+    <li>accLocation: Get the x,y coordinates, and the height and width of this IAccessible node.</li>
+    <li>accNavigate: Navigate up, down, left or right from this IAccessible.</li>
+    <li>accHitTest: Find out what IAccessible exists and a specific coordinate.</li>
+    <li>accDoDefaultAction: Perform the action described by get_accDefaultAction.</li>
+    <li>put_accName: Change the name.</li>
+    <li>put_accValue: Change the value.</li>
+</ul>
+</p>
+</ul>
+<h2>The Basics</h2>
+<ul>
+<p>
+Rather than directly implement IAccessible with an Accessible class, we have chosen to proxy to our own cross-platform interface,
+called nsIAccessible, which is more robust. It has the capability of supporting other new accessibility API's such
+as Sun's Gnome Accessiblity API. The nsIAccessible interface is implemented by a variety of classes for each of the
+various objects in HTML. Each class is tailored to the specific abilities and properties of the HTML objects it applies to.
+</p>
+<p>
+The first thing that happens when an accessibility aid wants to watch our application is calls the Windows API function
+AccessibleObjectFromWindow(). This in turns sends the window in question
+a <a href="http://lxr.mozilla.org/seamonkey/search?string=WM_GETOBJECT">WM_GETOBJECT</a> message requesting an IAccessible for the window. 
+In our case, this event is received in mozilla/widget/src/windows/nsWindow.cpp.
+We send back an IAccessible interface that represents that root window. The accessibility aid will use
+that first IAccessible to reach rest of the IAccessible hierarchy, by asking for it's children IAccessibles, asking the children for the 
+grandchildren IAccessibles, and so on. Until this WM_GETOBJECT message is processed, the accessibility.dll is not loaded,
+so there is almost zero overhead for accessibility in Mozilla.
+</p>
+</ul>
+
+<h2>How the IAccessible's are Created</h2>
+<ul>
+<p>
+To create the root IAccessible for a window the first time it gets the <a href="http://lxr.mozilla.org/seamonkey/search?string=WM_GETOBJECT">WM_GETOBJECT</a> message in, 
+nsWindow.cpp first generates an internal event 
+called <a href="http://lxr.mozilla.org/seamonkey/search?string=NS_GETACCESSIBLE">NS_GETACCESSIBLE</a>, 
+which is handled in nsFrame.cpp via the creation of an nsRootAccessible implementation of the nsIAccessible interface.
+The first IAccessible is then created by instantiating a RootAccessible class. This RootAccessible is also cached by
+the nsWindow it's for, so that any additional WM_GETOBJECT messages use the same RootAccessible.
+The RootAccessible class used to implement IAccessible here is slightly different from the normal Accessible class
+that's used, in that it keeps track of event data.
+RootAccessible and Accessible  are both implemented 
+in <a href="http://lxr.mozilla.org/seamonkey/source/widget/source/windows/Accessible.cpp">
+mozilla/widget/src/windows/Accessible.cpp</a>).
+</P>
+</ul>
+<h2>The Real Power Behind IAccessible's</h2>
+<ul>
+<p>The implementations of IAccessible (Accessible and RootAccessible), don't know anything about Mozilla
+objects. They merely proxy to our cross platform accessibility classes, which all have an nsIAccessible interface.
+</h2>
+<p>
+The base implementation for nsIAccessible is called nsAccessible. It has default implementations for all the
+nsIAccessible methods. It also knows how
+to walk Mozilla's content DOM and frame tree, exposing only the objects that are needed for accessibility. 
+Essentially, nsAccessible knows what it needs to expose by asking each DOM node's primary frame for 
+an nsIAccessible, using the GetAccessible() method. If it gets one, it's considered an accessible object. 
+A frame that wishes to return
+an nsIAccessible GetAccessible() is called, creates one of the correct type on the fly using 
+nsIAccessibilityService methods built for that purpose.
+</p>
+<p>
+The specific implementations
+of nsIAccessible for each widget or content type inherit from nsAccessible.
+Each implementation then overrides those methods
+it wishes to implement, and does nothing for those methods it wants the default behavior for.
+For example, the default behavior for nsIAccessible::getAccFirstChild is to
+instantial a nsDOMTreeWalker, and ask it for the first child. However, nsImageAccessible overrides getAccFirstChild,
+returning the first area of an image map if there is one, otherwise nsnull.
+</p>
+
+</ul>
+<h2>MSAA Events</h2>
+<ul>
+<p>
+When an accessibility-related event occurs within an application such as Mozilla, it must use NotifyWinEvent from
+the Win32 API. NotifyWinEvent is passed arguments for the window the event occured in, and the number of the child
+within that window. Accessibility aids use the Win32 call SetWinEventHook() to register as a listener for these events.
+</p>
+<p>
+The accessibility aid is choose which events it is interested in learning more about by using the Win32 API call 
+AccessibleObjectFromEvent, requesting the IAccessible to the node corresponding to the 
+child number that had been indicated from NotifyWinEvent(). This ends up asking our RootAccessible for the child
+IAccessible that matches the window handle and child id we indicated through NotofyWinEvent().
+</p>
+<p>
+In Mozilla, this creates a problem. We cannot 
+keep track of a child number for every important accessible node in a document. We deal with this by generating fake
+child IDs for the most recent accessibile events that we have generated, in a circular array.
+</p>
+<p>
+Since there is a RootAccessible for each top level window that might generate MSAA events, that's where we do the bookkeeping
+for these events and their nsIAccessible's. Whenever NotifyWinEvent() is called, a new fake ID is generated (We use 
+negative numbers for the fake IDs). When the callback comes to request the IAccessible for that child number,
+we check the circular array for that ID, and voila, we have the corresponding nsIAccessible to proxy.
+</p>
+<p>
+Every RootAccessible has an nsRootAccessible which is an nsIAccessibleEventReceiver. The RootAccessible 
+uses this to register itself as an nsIAccessibleEventListener. In the end, nsRootAccessible registers itself as a listener 
+of Mozilla's internal and DOM events. It's HandleEvent routine translates these events into MSAA events, and passes them along to 
+with an nsIAccessible to the original RootAccessible::HandleEvent 
+which turns that nsIAccessible into a NotifyWinEvent call, complete with a fake child ID.
+</p>
+<p>
+Most MSAA events aren't utilized by accessibility aids. Therefore we implement only the handful that matter.
+The most important event is the focus event, followed by name, state and value change events.
+</p>
+</ul>
+</body>
+</html>

mozilla/accessible/build/Makefile.in

@@ -0,0 +1,60 @@
+#
+# 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): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= accessibility
+LIBRARY_NAME	= accessibility
+EXPORT_LIBRARY = 1
+SHORT_LIBNAME	= access
+IS_COMPONENT	= 1
+MODULE_NAME	= nsAccessibilityModule
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  $(NULL)
+
+CPPSRCS		= nsAccessibilityFactory.cpp
+
+LOCAL_INCLUDES	= -I$(srcdir)/../src
+
+SHARED_LIBRARY_LIBS = \
+    $(DIST)/lib/libaccessibility_s.$(LIB_SUFFIX) \
+    $(NULL)
+
+EXTRA_DSO_LIBS = \
+    gkconshared_s \
+    $(NULL)
+
+EXTRA_DSO_LDOPTS =           \
+    $(MOZ_COMPONENT_LIBS)    \
+    -L$(DIST)/lib            \
+    $(EXTRA_DSO_LIBS)        \
+    -lgkgfx                  \
+    $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/build/makefile.win

@@ -0,0 +1,50 @@
+#!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): 
+
+DEPTH=..\..
+MODULE=accessibility
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  $(NULL)
+LIBRARY_NAME=accessibility
+MODULE_NAME=nsAccessibilityModule
+
+CPP_OBJS=\
+  .\$(OBJDIR)\nsAccessibilityFactory.obj    \
+  $(NULL)
+
+LINCS = $(LINCS) -I..\src         # for implementation headers
+
+SUB_LIBRARIES=\
+  $(DIST)\lib\accessibility_s.lib           \
+  $(NULL)
+
+LLIBS=\
+  $(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

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsCOMPtr.h"
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsIAccessibilityService.h"
+#include "nscore.h"
+
+static NS_IMETHODIMP
+NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    nsresult rv;
+    NS_ASSERTION(aOuter == nsnull, "no aggregation");
+    nsIAccessibilityService* accessibility;
+    rv = NS_NewAccessibilityService(&accessibility);
+    if (NS_FAILED(rv)) {
+        NS_ERROR("Unable to construct chrome registry");
+        return rv;
+    }
+    rv = accessibility->QueryInterface(aIID, aResult);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to find correct interface");
+    NS_RELEASE(accessibility);
+    return rv;
+}
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+    { "AccessibilityService", 
+      NS_ACCESSIBILITY_SERVICE_CID,
+      "@mozilla.org/accessibilityService;1", 
+      NS_ConstructAccessibilityService
+    },
+};
+
+NS_IMPL_NSGETMODULE(nsAccessibilityModule, components);
+

mozilla/accessible/makefile.win

@@ -0,0 +1,26 @@
+#!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): 
+
+DEPTH=..
+
+DIRS= public src build
+
+include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/MANIFEST

@@ -0,0 +1,2 @@
+nsIAccessibilityService.idl
+nsIAccessible.idl

mozilla/accessible/public/Makefile.in

@@ -0,0 +1,46 @@
+#
+# 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): 
+#
+
+DEPTH   = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE    = accessibility
+XPIDL_MODULE= accessibility
+
+XPIDLSRCS = \
+      nsIAccessibilityService.idl \
+      nsIAccessible.idl \
+      nsIAccessibleDocument.idl \
+      nsIAccessibleEventReceiver.idl \
+      nsIAccessibleEventListener.idl \
+      nsIAccessibleSelectable.idl    \
+      nsIAccessibleProvider.idl \
+      $(NULL)
+
+EXPORTS = \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/public/makefile.win

@@ -0,0 +1,39 @@
+#!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): 
+
+DEPTH=..\..
+MODULE=accessibility
+XPIDL_MODULE=accessibility
+
+XPIDLSRCS =               \
+  .\nsIAccessibilityService.idl \
+  .\nsIAccessible.idl \
+  .\nsIAccessibleDocument.idl \
+  .\nsIAccessibleEventReceiver.idl \
+  .\nsIAccessibleEventListener.idl \
+  .\nsIAccessibleSelectable.idl \
+  .\nsIAccessibleProvider.idl \
+  $(NULL)
+
+EXPORTS = \
+  $(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "domstubs.idl"
+#include "nsIAtom.idl"
+#include "domstubs.idl"
+#include "nsIAccessible.idl"
+
+interface nsIWeakReference;
+
+[scriptable, uuid(68D9720A-0984-42b6-A3F5-8237ED925727)]
+interface nsIAccessibilityService : nsISupports
+{
+  nsIAccessible createRootAccessible(in nsISupports aPresContext, in nsISupports aFrame);
+  nsIAccessible createHTMLComboboxAccessible(in nsIDOMNode aNode, in nsISupports aPresShell);
+  nsIAccessible createHTMLListboxAccessible(in nsIDOMNode aNode, in nsISupports aPresShell);
+  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 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 createXULImageAccessible(in nsIDOMNode aNode);
+  nsIAccessible createXULTextAccessible(in nsIDOMNode aNode);
+  nsIAccessible createAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
+  nsIAccessible getAccessibleFor(in nsIDOMNode aNode);
+};
+
+
+%{ C++
+
+// for component registration
+// {DE401C37-9A7F-4278-A6F8-3DE2833989EF}
+#define NS_ACCESSIBILITY_SERVICE_CID \
+{ 0xde401c37, 0x9a7f, 0x4278, { 0xa6, 0xf8, 0x3d, 0xe2, 0x83, 0x39, 0x89, 0xef } }
+
+extern nsresult
+NS_NewAccessibilityService(nsIAccessibilityService** aResult);
+
+%}

mozilla/accessible/public/nsIAccessible.idl

@@ -0,0 +1,192 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric D Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ * Aaron Leventhal
+ * John Gaunt
+ */
+
+#include "nsISupports.idl"
+#include "nsIDOMNode.idl"
+#include "domstubs.idl"
+
+[scriptable, uuid(B26FBE47-9A5F-42a1-822B-082461AE4D6D)]
+interface nsIAccessible : nsISupports
+{
+  readonly attribute nsIAccessible accParent;
+  readonly attribute nsIAccessible accNextSibling;
+  readonly attribute nsIAccessible accPreviousSibling;
+  readonly attribute nsIAccessible accFirstChild;
+  readonly attribute nsIAccessible accLastChild;
+
+  readonly attribute long accChildCount;
+  attribute DOMString accName;
+  readonly attribute DOMString accValue;
+
+  readonly attribute DOMString accDescription;
+  readonly attribute unsigned long accRole;
+  readonly attribute unsigned long accState;
+  readonly attribute unsigned long accExtState;
+
+  readonly attribute DOMString accHelp;
+  readonly attribute nsIAccessible accFocused;
+
+  nsIAccessible accGetAt(in long x, in long y);
+
+  nsIAccessible accNavigateRight();
+  nsIAccessible accNavigateLeft();
+  nsIAccessible accNavigateUp();
+  nsIAccessible accNavigateDown();
+
+  void accGetBounds(out long x, 
+                    out long y, 
+                    out long width, 
+                    out long height);
+
+  void accAddSelection();
+  void accRemoveSelection();
+  void accExtendSelection();
+  void accTakeSelection();
+  void accTakeFocus();
+
+  readonly attribute PRUint8 accNumActions;
+  DOMString getAccActionName(in PRUint8 index);
+  void accDoAction(in PRUint8 index);   // Action number 0 is the default action
+
+  nsIDOMNode accGetDOMNode();
+
+  // Used by Accessible implementation to save data and speed up accessibility tree walking
+  [noscript] void CacheOptimizations(in nsIAccessible aParent, in PRInt32 aSiblingIndex, in nsIDOMNodeList aSiblingList);
+
+ // MSAA State flags - used for bitfield. More than 1 allowed.
+  const unsigned long  STATE_UNAVAILABLE        = 0x00000001;  // Disabled, maps to opposite of Java ENABLED, Gnome/ATK SENSITIVE?
+  const unsigned long  STATE_SELECTED           = 0x00000002;
+  const unsigned long  STATE_FOCUSED            = 0x00000004;
+  const unsigned long  STATE_PRESSED            = 0x00000008;
+  const unsigned long  STATE_CHECKED            = 0x00000010;
+  const unsigned long  STATE_MIXED              = 0x00000020; // 3-state checkbox or toolbar button
+  const unsigned long  STATE_READONLY           = 0x00000040; // Maps to opposite of Java/Gnome/ATK EDITABLE state
+  const unsigned long  STATE_HOTTRACKED         = 0x00000080;
+  const unsigned long  STATE_DEFAULT            = 0x00000100;
+  const unsigned long  STATE_EXPANDED           = 0x00000200;
+  const unsigned long  STATE_COLLAPSED          = 0x00000400;
+  const unsigned long  STATE_BUSY               = 0x00000800;
+  const unsigned long  STATE_FLOATING           = 0x00001000;  // Children "owned" not "contained" by parent
+  const unsigned long  STATE_MARQUEED           = 0x00002000;
+  const unsigned long  STATE_ANIMATED           = 0x00004000;
+  const unsigned long  STATE_INVISIBLE          = 0x00008000;
+  const unsigned long  STATE_OFFSCREEN          = 0x00010000;
+  const unsigned long  STATE_SIZEABLE           = 0x00020000;
+  const unsigned long  STATE_MOVEABLE           = 0x00040000;
+  const unsigned long  STATE_SELFVOICING        = 0x00080000;
+  const unsigned long  STATE_FOCUSABLE          = 0x00100000;
+  const unsigned long  STATE_SELECTABLE         = 0x00200000;
+  const unsigned long  STATE_LINKED             = 0x00400000;
+  const unsigned long  STATE_TRAVERSED          = 0x00800000;
+  const unsigned long  STATE_MULTISELECTABLE    = 0x01000000;  // Supports multiple selection
+  const unsigned long  STATE_EXTSELECTABLE      = 0x02000000;  // Supports extended selection
+  const unsigned long  STATE_ALERT_LOW          = 0x04000000;  // This information is of low priority
+  const unsigned long  STATE_ALERT_MEDIUM       = 0x08000000;  // This information is of medium priority
+  const unsigned long  STATE_ALERT_HIGH         = 0x10000000;  // This information is of high priority
+  const unsigned long  STATE_PROTECTED          = 0x20000000;  // Maps to Gnome's *Role* ATK_ROLE_PASSWD_TEXT, nothing for Java?
+  const unsigned long  STATE_HASPOPUP           = 0x40000000;  // New in MSAA 2.0
+
+// Extended state flags (for now non-MSAA, for Java and Gnome/ATK support)
+// This is only the states that there isn't already a mapping for in MSAA
+// See www.accessmozilla.org/article.php?sid=11 for information on the mappings between accessibility API states
+  const unsigned long  STATE_INVALID            = 0x00200000;  // No explanation given    
+  const unsigned long  STATE_ACTIVE             = 0x00400000;  // This window is currently the active window    
+  const unsigned long  STATE_EXPANDABLE         = 0x00800000;  // An item that can be expanded, such as a tree item with children    
+  const unsigned long  STATE_MODAL              = 0x01000000;  // Must do something with control before leaving it    
+  const unsigned long  STATE_MULTI_LINE         = 0x02000000;  // Edit control that can take multiple lines    
+  const unsigned long  STATE_SENSITIVE          = 0x04000000;  // No explanation given    
+  const unsigned long  STATE_RESIZABLE          = 0x08000000;  // Object can be resized    
+  const unsigned long  STATE_SHOWING            = 0x10000000;  // This object and all of it's ancestors are visible    
+  const unsigned long  STATE_SINGLE_LINE        = 0x20000000;  // This text object can only contain 1 line of text    
+  const unsigned long  STATE_TRANSIENT          = 0x40000000;  // Tells accessibility aid "Don't add event listener - this object doesn't generate any". For example, could be used with higher level containers.    
+  const unsigned long  STATE_VERTICAL           = 0x80000000;  // Especially used for sliders and scrollbars  
+
+
+// MSAA Roles - only one per nsIAccessible or IAccessible
+  const unsigned long  ROLE_TITLEBAR            = 0x00000001;
+  const unsigned long  ROLE_MENUBAR             = 0x00000002;
+  const unsigned long  ROLE_SCROLLBAR           = 0x00000003;
+  const unsigned long  ROLE_GRIP                = 0x00000004;
+  const unsigned long  ROLE_SOUND               = 0x00000005;
+  const unsigned long  ROLE_CURSOR              = 0x00000006;
+  const unsigned long  ROLE_CARET               = 0x00000007;
+  const unsigned long  ROLE_ALERT               = 0x00000008;
+  const unsigned long  ROLE_WINDOW              = 0x00000009;
+  const unsigned long  ROLE_CLIENT              = 0x0000000A;
+  const unsigned long  ROLE_MENUPOPUP           = 0x0000000B;
+  const unsigned long  ROLE_MENUITEM            = 0x0000000C;
+  const unsigned long  ROLE_TOOLTIP             = 0x0000000D;
+  const unsigned long  ROLE_APPLICATION         = 0x0000000E;
+  const unsigned long  ROLE_DOCUMENT            = 0x0000000F;
+  const unsigned long  ROLE_PANE                = 0x00000010;
+  const unsigned long  ROLE_CHART               = 0x00000011;
+  const unsigned long  ROLE_DIALOG              = 0x00000012;
+  const unsigned long  ROLE_BORDER              = 0x00000013;
+  const unsigned long  ROLE_GROUPING            = 0x00000014;
+  const unsigned long  ROLE_SEPARATOR           = 0x00000015;
+  const unsigned long  ROLE_TOOLBAR             = 0x00000016;
+  const unsigned long  ROLE_STATUSBAR           = 0x00000017;
+  const unsigned long  ROLE_TABLE               = 0x00000018;
+  const unsigned long  ROLE_COLUMNHEADER        = 0x00000019;
+  const unsigned long  ROLE_ROWHEADER           = 0x0000001A;
+  const unsigned long  ROLE_COLUMN              = 0x0000001B;
+  const unsigned long  ROLE_ROW                 = 0x0000001C;
+  const unsigned long  ROLE_CELL                = 0x0000001D;
+  const unsigned long  ROLE_LINK                = 0x0000001E;
+  const unsigned long  ROLE_HELPBALLOON         = 0x0000001F;
+  const unsigned long  ROLE_CHARACTER           = 0x00000020;
+  const unsigned long  ROLE_LIST                = 0x00000021;
+  const unsigned long  ROLE_LISTITEM            = 0x00000022;
+  const unsigned long  ROLE_OUTLINE             = 0x00000023;
+  const unsigned long  ROLE_OUTLINEITEM         = 0x00000024;
+  const unsigned long  ROLE_PAGETAB             = 0x00000025;
+  const unsigned long  ROLE_PROPERTYPAGE        = 0x00000026;
+  const unsigned long  ROLE_INDICATOR           = 0x00000027;
+  const unsigned long  ROLE_GRAPHIC             = 0x00000028;
+  const unsigned long  ROLE_STATICTEXT          = 0x00000029;
+  const unsigned long  ROLE_TEXT                = 0x0000002A;  // Editable, selectable, etc.
+  const unsigned long  ROLE_PUSHBUTTON          = 0x0000002B;
+  const unsigned long  ROLE_CHECKBUTTON         = 0x0000002C;
+  const unsigned long  ROLE_RADIOBUTTON         = 0x0000002D;
+  const unsigned long  ROLE_COMBOBOX            = 0x0000002E;
+  const unsigned long  ROLE_DROPLIST            = 0x0000002F;
+  const unsigned long  ROLE_PROGRESSBAR         = 0x00000030;
+  const unsigned long  ROLE_DIAL                = 0x00000031;
+  const unsigned long  ROLE_HOTKEYFIELD         = 0x00000032;
+  const unsigned long  ROLE_SLIDER              = 0x00000033;
+  const unsigned long  ROLE_SPINBUTTON          = 0x00000034;
+  const unsigned long  ROLE_DIAGRAM             = 0x00000035;
+  const unsigned long  ROLE_ANIMATION           = 0x00000036;
+  const unsigned long  ROLE_EQUATION            = 0x00000037;
+  const unsigned long  ROLE_BUTTONDROPDOWN      = 0x00000038;
+  const unsigned long  ROLE_BUTTONMENU          = 0x00000039;
+  const unsigned long  ROLE_BUTTONDROPDOWNGRID  = 0x0000003A;
+  const unsigned long  ROLE_WHITESPACE          = 0x0000003B;
+  const unsigned long  ROLE_PAGETABLIST         = 0x0000003C;
+  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 
+};

mozilla/accessible/public/nsIAccessibleDocument.idl

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Aaron Leventhal
+ * 
+ * Contributor(s): 
+ * John Gaunt
+ */
+
+#include "nsISupports.idl"
+#include "nsIAccessible.idl"
+#include "domstubs.idl"
+interface nsIDocument;
+
+[scriptable, uuid(8781FC88-355F-4439-881F-6504A0A1CEB6)]
+interface nsIAccessibleDocument : nsISupports
+{
+  readonly attribute DOMString URL;
+  readonly attribute DOMString title;
+  readonly attribute DOMString mimeType;
+  readonly attribute DOMString docType;
+  DOMString getNameSpaceURIForID(in short nameSpaceID);
+  [noscript] nsIDocument getDocument();
+
+};

mozilla/accessible/public/nsIAccessibleEventListener.idl

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric D Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "nsIAccessible.idl"
+
+[scriptable, uuid(BEE49E7D-9D06-49bf-8984-1694C697D74F)]
+interface nsIAccessibleEventListener : nsISupports
+{
+  // these are set to the values given by MSAA
+  const unsigned long EVENT_FOCUS              = 0x8005;
+  const unsigned long EVENT_STATE_CHANGE       = 0x800A;
+  const unsigned long EVENT_NAME_CHANGE        = 0x800C;
+  const unsigned long EVENT_SELECTION          = 0x8006;
+  const unsigned long EVENT_SELECTION_ADD      = 0x8007;
+  const unsigned long EVENT_SELECTION_REMOVE   = 0x8008;
+  const unsigned long EVENT_SELECTION_WITHIN   = 0x8009;
+
+  void handleEvent(in unsigned long aEvent, in nsIAccessible aTarget);
+};

mozilla/accessible/public/nsIAccessibleEventReceiver.idl

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric D Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsIAccessibleEventListener.idl"
+
+[scriptable, uuid(AB331E47-4FAA-4a12-9480-9B480DD78B39)]
+interface nsIAccessibleEventReceiver : nsISupports
+{
+  void addAccessibleEventListener(in nsIAccessibleEventListener aListener);
+  void removeAccessibleEventListener();
+};

mozilla/accessible/public/nsIAccessibleProvider.idl

@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: John Gaunt (jgaunt@netscape.com)
+ * 
+ * Contributor(s): 
+ * John Gaunt
+ */
+
+#include "nsISupports.idl"
+#include "nsIAccessible.idl"
+
+[scriptable, uuid(3f0e3eb0-1dd2-11b2-9605-be5b8e76cf4b)]
+interface nsIAccessibleProvider : nsISupports
+{
+	readonly attribute nsIAccessible accessible;
+};

mozilla/accessible/public/nsIAccessibleSelectable.idl

@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: John Gaunt (jgaunt@netscape.com)
+ * 
+ * Contributor(s): 
+ * John Gaunt
+ */
+
+#include "nsISupports.idl"
+#include "nsIAccessible.idl"
+#include "nsISupportsArray.idl"
+
+[scriptable, uuid(34d268d6-1dd2-11b2-9d63-83a5e0ada290)]
+interface nsIAccessibleSelectable : nsISupports
+{
+	nsISupportsArray GetSelectedChildren();
+};

mozilla/accessible/src/MANIFEST

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

mozilla/accessible/src/Makefile.in

@@ -0,0 +1,80 @@
+#
+# 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): 
+#
+
+DEPTH   = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+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)
+
+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/MANIFEST

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

mozilla/accessible/src/base/accessible.properties

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

mozilla/accessible/src/base/jar.mn

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

mozilla/accessible/src/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/base/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/html/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/jar.mn

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

mozilla/accessible/src/makefile.win

@@ -0,0 +1,87 @@
+#!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): 
+
+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)
+
+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/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/xul/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/xul/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/xul/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/aclocal.m4

@@ -0,0 +1,14 @@
+dnl
+dnl Local autoconf macros used with mozilla
+dnl The contents of this file are under the Public Domain.
+dnl 
+
+builtin(include, build/autoconf/glib.m4)dnl
+builtin(include, build/autoconf/gtk.m4)dnl
+builtin(include, build/autoconf/libIDL.m4)dnl
+builtin(include, build/autoconf/nspr.m4)dnl
+builtin(include, build/autoconf/pkg.m4)dnl
+dnl
+define(MOZ_TOPSRCDIR,.)dnl MOZ_TOPSRCDIR is used in altoptions.m4
+builtin(include, build/autoconf/altoptions.m4)dnl
+