Fixed hieroglyphs for Mozilla

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

mozilla/LEGAL

@@ -1,18 +1,15 @@
 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
+A) Wang contends that its U.S. Patent No. 4, 751,669 ("the '669
+Patent") disclosing a "video text" 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 based on mime types (performed in
+Windows OS) --See Claim 38.  Netscape believes the '669 Patent is
+invalid and non-infringed. Netscape is vigorously defending against
+Wang's claims.
 
 B)   Intermind owns pending U.S. patent applications on communications
 systems which employ metadata ("channel objects") to define a control
@@ -38,6 +35,3 @@ 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

@@ -1,83 +1,71 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
+                           NETSCAPE PUBLIC LICENSE
+                                Version 1.0
 
-                              ---------------
+                              ----------------
 
 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
+     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
+     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
+     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
+     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
+     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.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
+     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. ``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
+     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
+     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.
+     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
+     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 a list of 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.
+     1.12. ``You'' 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 fifty percent (50%) or more of the
+     outstanding shares or beneficial ownership of such entity.
 
 2. Source Code License.
 
@@ -85,75 +73,49 @@
      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).
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Original Code (or portions thereof) with or without
+          Modifications, or as part of a Larger Work; and
 
-          (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.
+          (b) under patents now or hereafter owned or controlled by Initial
+          Developer, to make, have made, use and sell (``Utilize'') the
+          Original Code (or portions thereof), but solely to the extent that
+          any such patent is reasonably necessary to enable You to Utilize
+          the Original Code (or portions thereof) and not to any greater
+          extent that may be necessary to Utilize further Modifications or
+          combinations.
 
      2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
+     Each Contributor 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 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
+          (a) 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 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.
+          (b) under patents now or hereafter owned or controlled by
+          Contributor, to Utilize the Contributor Version (or portions
+          thereof), but solely to the extent that any such patent is
+          reasonably necessary to enable You to Utilize the Contributor
+          Version (or portions thereof), and not to any greater extent that
+          may be necessary to Utilize further Modifications or combinations.
 
 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.
+     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
@@ -169,86 +131,77 @@
      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
+     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
+     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.
+          If You have knowledge that a party claims an intellectual property
+          right in particular functionality or code (or its utilization
+          under this License), you 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 you obtain such knowledge after You
+          make Your Modification available as described in Section 3.2, You
+          shall promptly modify the LEGAL file in all copies You make
+          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.
+          If Your Modification is an application programming interface and
+          You own or control patents which are reasonably necessary to
+          implement that API, you must also include this information in the
+          LEGAL file.
 
      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.
+     Code, and this License in any documentation for the Source Code, where
+     You describe recipients' rights relating to Covered Code. If You
+     created one or more Modification(s), You may add your name as a
+     Contributor to the notice described in Exhibit A. 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 file) where a user would be likely to look for such
+     a notice. 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.
+     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 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
@@ -259,27 +212,26 @@
 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.
+     License with respect to some or all of the Covered Code due to statute
+     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.
+     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.
+     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
@@ -290,22 +242,20 @@
      Covered Code created under this License.
 
      6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
+     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
+     governed by this License), you must (a) rename Your license so that the
+     phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+     any confusingly similar phrase do not appear anywhere in your 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.)
+     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,
+     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.
@@ -318,7 +268,7 @@
 
 8. TERMINATION.
 
-     8.1.  This License and the rights granted hereunder will terminate
+     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
@@ -326,69 +276,28 @@
      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
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL 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
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+     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.
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+     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
+     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
@@ -400,168 +309,113 @@
      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.
+     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: (a) unless otherwise agreed in writing, all disputes relating
+     to this License (excepting any dispute relating to intellectual
+     property rights) shall be subject to final and binding arbitration,
+     with the losing party paying all costs of arbitration; (b) any
+     arbitration relating to this Agreement shall be held in Santa Clara
+     County, California, under the auspices of JAMS/EndDispute; and (c) any
+     litigation relating to this Agreement 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.
+     Except in cases where another Contributor has failed to comply with
+     Section 3.4, You are responsible for damages arising, directly or
+     indirectly, out of Your utilization of rights under this License, based
+     on the number of copies of Covered Code you made available, the
+     revenues you received from utilizing such rights, and other relevant
+     factors. You agree to work with affected parties to distribute
+     responsibility on an equitable basis.
 
-13. MULTIPLE-LICENSED CODE.
+AMENDMENTS
+Additional Terms applicable to the Netscape Public License.
 
-     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.
+     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.
 
-EXHIBIT A -Mozilla Public 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.
 
-     ``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
+     III. Netscape and logo.
+     This License does not grant any rights to use the trademark
+     ``Netscape'', the ``Netscape N and horizon'' logo or the Netscape
+     lighthouse logo, even if such marks are included in the Original Code.
+
+     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
+          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.
+
+     VI. Arbitration and Litigation.
+     Notwithstanding the limitations of Section 11 above, the provisions
+     regarding arbitration and litigation in Section 11(a), (b) and (c) of
+     the License shall apply to all disputes relating to this License.
+
+EXHIBIT A.
+
+     ``The contents of this file are subject to the Netscape Public License
+     Version 1.0 (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/
+     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 ______________________________________.
+     The Original Code is Mozilla Communicator client code, released March
+     31, 1998.
 
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
+     The Initial Developer of the Original Code is Netscape Communications
+     Corporation. Portions created by Netscape are Copyright (C) 1998
+     Netscape Communications Corporation. All Rights Reserved.
 
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of 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."
+     Contributor(s): ______________________________________.''
 
      [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."
+     the notices in the Source Code files of the Original Code. This is due
+     to time constraints encountered in simultaneously finalizing the
+     License and in preparing the Original Code for release. You should use
+     the text of this Exhibit A rather than the text found in the Original
+     Code Source Code for Your Modifications.]

mozilla/Makefile

@@ -0,0 +1,83 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= .
+
+NSPRDIR		= nsprpub
+NSPR20		= 1
+MOZILLA_CLIENT	= 1
+
+ifndef NO_MOCHA
+DIRS_JS		= js
+endif
+
+DIRS		= config coreconf $(NSPRDIR) jpeg dbm xpcom
+
+ifdef MOZ_NETCAST
+DIRS		+= netcast
+endif
+
+ifdef MOZ_JAVA
+DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
+else
+DIRS		+= sun-java nav-java $(DIRS_JS)
+endif
+
+ifndef NO_SECURITY
+DIRS		+= security
+endif
+
+DIRS		+= modules lib l10n cmd
+
+ifeq ($(STAND_ALONE_JAVA),1)
+DIRS		= config lib/xp $(NSPRDIR) jpeg modules/zlib sun-java ifc js ifc/tools sun-java/java
+endif
+
+include $(DEPTH)/config/rules.mk
+
+export:: $(OBJS)
+
+# Running this rule assembles all the SDK source pieces into dist/sdk.
+# You'll need to run this rule on every platform to get all the
+# binaries (e.g. javah) copied there. You'll also have to do special
+# magic on a Mac.
+sdk-src::
+	$(SDKINSTALL) include/npapi.h $(SDK)/include/
+	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
+	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
+	$(SDKINSTALL) include/jri.h $(SDK)/include/
+	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
+	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
+	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
+	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
+	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
+	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
+	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
+	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
+	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
+
+sdk-bin::
+	cd sdk; $(MAKE); cd ..
+	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
+	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/

mozilla/Makefile.in

@@ -1,187 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-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
-
-DIRS		= config build
-
-ifdef MOZ_JAVA_SUPPLEMENT
-DIRS += 			\
-  java/util			\
-  java/webclient		\
-  $(NULL)
-endif
-
-# boehm needs to be built before XPCOM
-ifdef GC_LEAK_DETECTOR
-DIRS += gc/boehm
-endif
-
-DIRS	+= $(NSPRPUB_DIR)
-
-DIRS		+= dbm modules/libreg js string xpcom js/src/xpconnect
-
-ifdef MOZ_OJI
-DIRS		+= js/src/liveconnect
-endif
-
-ifdef MOZ_JSDEBUGGER
-DIRS		+= js/jsd
-endif
-
-ifndef MOZ_NATIVE_ZLIB
-DIRS		+= modules/zlib
-endif
-
-ifndef MOZ_NATIVE_JPEG
-DIRS		+= jpeg
-endif
-
-ifdef MOZ_ENABLE_XLIB
-DIRS           += gfx/src/xlibrgb widget/src/xlibxtbin
-endif
-
-ifdef MOZ_ENABLE_GTK
-DIRS           += widget/src/gtksuperwin widget/src/gtkxtbin
-endif
-
-# Linux and Solaris installer needs standalone libjar, hence standalone zlib
-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
-DIRS		+= modules/zlib/standalone
-endif
-
-DIRS		+= \
-		widget/timer \
-		include \
-		modules/libutil \
-		netwerk \
-		modules/mpfilelocprovider \
-		uriloader \
-		intl \
-		modules/libpref \
-		modules/libimg \
-		modules/oji \
-		modules/libjar \
-		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
-DIRS    += accessible
-endif
-
-# This must preceed xpfe
-ifdef MOZ_JPROF
-DIRS        += tools/jprof
-endif
-
-DIRS		+= xpfe
-
-DIRS		+= xpinstall
-
-ifdef MOZ_PSM
-DIRS		+= security/manager
-endif
-
-ifdef MOZ_LDAP_XPCOM
-DIRS	+=	directory/c-sdk/ldap directory/xpcom
-endif
-
-ifdef MOZ_EXTENSIONS
-DIRS		+= extensions
-endif
-
-ifdef MOZ_MAIL_NEWS
-DIRS		+= mailnews
-endif
-
-ifdef MOZ_LEAKY
-DIRS        += tools/leaky
-endif
-
-ifdef ENABLE_TESTS
-DIRS		+= xpcom/tests
-endif
-
-DIRS	+= l10n
-
-ifneq (,$(MOZ_STATIC_COMPONENTS)$(MOZ_META_COMPONENTS))
-DIRS   += modules/staticmod
-endif
-
-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
-
-export::
-	+$(LOOP_OVER_EXPORT_DIRS)
-
-distclean::
-	cat unallmakefiles | $(XARGS) rm -f
-	rm -f unallmakefiles $(DIST_GARBAGE)
-

mozilla/README/IBMChangeLog

@@ -1,2 +0,0 @@
-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

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

mozilla/accessible/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-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

@@ -1,190 +0,0 @@
-<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

@@ -1,57 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-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
-
-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

@@ -1,46 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=accessibility
-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

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "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

@@ -1,26 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..
-
-DIRS= public src build
-
-include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/MANIFEST

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

mozilla/accessible/public/Makefile.in

@@ -1,45 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-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    \
-      $(NULL)
-
-EXPORTS = \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/public/makefile.win

@@ -1,38 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=accessibility
-XPIDL_MODULE=accessibility
-
-XPIDLSRCS =               \
-  .\nsIAccessibilityService.idl \
-  .\nsIAccessible.idl \
-  .\nsIAccessibleDocument.idl \
-  .\nsIAccessibleEventReceiver.idl \
-  .\nsIAccessibleEventListener.idl \
-  .\nsIAccessibleSelectable.idl \
-  $(NULL)
-
-EXPORTS = \
-  $(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: 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 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

@@ -1,189 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: 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();
-
- // 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

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: 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

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: 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

@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: 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(in nsIAccessibleEventListener aListener);
-};

mozilla/accessible/public/nsIAccessibleSelectable.idl

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

mozilla/accessible/src/MANIFEST

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

mozilla/accessible/src/Makefile.in

@@ -1,58 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH   = ../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE    = accessibility
-LIBRARY_NAME  = accessibility_s
-REQUIRES  = xpcom string layout widget dom view locale intl docshell webshell necko htmlparser xuldoc imglib2 gfx2
-
-CPPSRCS   = \
-    nsAccessible.cpp \
-    nsAccessibilityService.cpp \
-    nsRootAccessible.cpp \
-    nsHTMLIFrameRootAccessible.cpp \
-    nsHTMLFormControlAccessible.cpp \
-    nsHTMLTextAccessible.cpp \
-    nsHTMLTableAccessible.cpp \
-    nsHTMLImageAccessible.cpp \
-    nsHTMLAreaAccessible.cpp \
-    nsHTMLLinkAccessible.cpp \
-    nsHTMLSelectListAccessible.cpp \
-    nsHTMLComboboxAccessible.cpp \
-    nsHTMLListboxAccessible.cpp \
-    nsGenericAccessible.cpp \
-    $(NULL)
-
-EXPORTS = \
-  nsRootAccessible.h \
-  $(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/src/accessible.properties

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

mozilla/accessible/src/base/MANIFEST

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

mozilla/accessible/src/base/accessible.properties

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

mozilla/accessible/src/base/jar.mn

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

mozilla/accessible/src/base/nsAccessibilityService.cpp

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

mozilla/accessible/src/base/nsAccessibilityService.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#ifndef __nsAccessibilityService_h__
-#define __nsAccessibilityService_h__
-
-#include "nsIAccessibilityService.h"
-#include "nsIContent.h"
-#include "nsIPresShell.h"
-#include "nsIDocShell.h"
-
-class nsIFrame;
-class nsIWeakReference;
-class nsIDOMNode;
-
-class nsAccessibilityService : public nsIAccessibilityService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBILITYSERVICE
-
-  // nsAccessibilityService methods:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
-public:
-
-private:
-  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aContent);
-  void GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent);
-  nsIContent* FindContentForDocShell(nsIPresShell* aPresShell, nsIContent* aContent, nsIDocShell*  aDocShell);
-
-};
-
-#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/base/nsAccessible.h

@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsAccessible_H_
-#define _nsAccessible_H_
-
-#include "nsISupports.h"
-#include "nsGenericAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsWeakReference.h"
-#include "nsIFocusController.h"
-#include "nsRect.h"
-#include "nsPoint.h"
-
-#define ACCESSIBLE_BUNDLE_URL "chrome://global/locale/accessible.properties"
-
-class nsIFrame;
-class nsIDocShell;
-class nsIWebShell;
-class nsIContent;
-
-class nsAccessible : public nsGenericAccessible
-{
-public:
-  NS_IMETHOD GetAccName(nsAWritableString& _retval);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFocused(nsIAccessible **_retval); 
-  NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval); 
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); 
-  NS_IMETHOD AccRemoveSelection(void); 
-  NS_IMETHOD AccTakeSelection(void); 
-  NS_IMETHOD AccTakeFocus(void); 
-  NS_IMETHOD AccGetDOMNode(nsIDOMNode **_retval); 
-
-  public:
-    nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-    virtual ~nsAccessible();
-
-    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
-
-    // Helper Routines for Sub-Docs
-    static nsresult GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
-    static nsresult GetDocShellObjects(nsIDocShell*     aDocShell,
-                                nsIPresShell**   aPresShell, 
-                                nsIPresContext** aPresContext, 
-                                nsIContent**     aContent);
-    static nsresult GetDocShells(nsIPresShell* aPresShell,
-                          nsIDocShell** aDocShell,
-                          nsIDocShell** aParentDocShell);
-    static nsresult GetParentPresShellAndContent(nsIPresShell*  aPresShell,
-                                          nsIPresShell** aParentPresShell,
-                                          nsIContent**   aSubShellContent);
-
-    static PRBool FindContentForWebShell(nsIPresShell* aParentPresShell,
-                                  nsIContent*   aParentContent,
-                                  nsIWebShell*  aWebShell,
-                                  nsIContent**  aFoundContent);
-    nsresult CalcOffset(nsIFrame* aFrame,
-                        nsIPresContext * aPresContext,
-                        nsRect& aRect);
-    nsresult GetAbsPosition(nsIPresShell* aPresShell, nsPoint& aPoint);
-    nsresult GetAbsoluteFramePosition(nsIPresContext* aPresContext,
-                                      nsIFrame *aFrame, 
-                                      nsRect& aAbsoluteTwipsRect, 
-                                      nsRect& aAbsolutePixelRect);
-    static nsresult GetTranslatedString(PRUnichar *aKey, nsAWritableString *aStringOut);
-
-    // helper method to verify frames
-    static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom);
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIFrame* GetBoundsFrame();
-  virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
-  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString);
-  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString);
-
-  // Data Members
-  nsCOMPtr<nsIDOMNode> mDOMNode;
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIFocusController> mFocusController;
-
-};
-
-/* Special Accessible that knows how to handle hit detection for flowing text */
-class nsHTMLBlockAccessible : public nsAccessible
-{
-public:
-   nsHTMLBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-};
-
-/* Leaf version of DOM Accessible
- * has no children
- */
-class nsLeafAccessible : public nsAccessible
-{
-  public:
-    nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-
-class nsLinkableAccessible : public nsAccessible
-{
-  public:
-    nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-    NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-    NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-    NS_IMETHOD AccDoAction(PRUint8 index);
-    NS_IMETHOD GetAccState(PRUint32 *_retval);
-    NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-
-  protected:
-    PRBool IsALink();
-    PRBool mIsALinkCached;  // -1 = unknown, 0 = not a link, 1 = is a link
-    nsCOMPtr<nsIContent> mLinkContent;
-    PRBool mIsLinkVisited;
-};
-
-
-#endif  

mozilla/accessible/src/base/nsGenericAccessible.cpp

@@ -1,225 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsIFrame.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-#include "nsISelectionController.h"
-#include "nsReadableUtils.h"
-#include "nsIContent.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
-
-nsGenericAccessible::nsGenericAccessible()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-nsGenericAccessible::~nsGenericAccessible()
-{
-  /* destructor code */
-}
-
-/* nsIAccessible getAccParent (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAReadableString& name)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* PRUint8 getAccNumActions (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccActionName (in PRUint8 index); */
-NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accDoAction (in PRUint8 index); */
-NS_IMETHODIMP nsGenericAccessible::AccDoAction(PRUint8 index)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFocused(); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFocused(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateRight (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateLeft (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateUp (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateDown (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accAddSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accExtendSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccExtState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsGenericAccessible::AccGetDOMNode(nsIDOMNode **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-

mozilla/accessible/src/base/nsGenericAccessible.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsGenericAccessible_H_
-#define _nsGenericAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/**
- * Basic implementation
- * supports nothing
- */
-class nsGenericAccessible : public nsIAccessible
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-
-  public:
-    nsGenericAccessible();
-    virtual ~nsGenericAccessible();
-};
-
-
-#endif  

mozilla/accessible/src/base/nsRootAccessible.cpp

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

mozilla/accessible/src/base/nsRootAccessible.h

@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsRootAccessible_H_
-#define _nsRootAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIAccessibleEventReceiver.h"
-#include "nsIAccessibleEventListener.h"
-#include "nsIAccessibleDocument.h"
-#include "nsIDOMFormListener.h"
-#include "nsIDOMFocusListener.h"
-#include "nsIDocument.h"
-#include "nsIAccessibilityService.h"
-
-class nsDocAccessibleMixin
-{
-  public:
-    nsDocAccessibleMixin(nsIDocument *doc);
-    nsDocAccessibleMixin(nsIWeakReference *aShell);
-    virtual ~nsDocAccessibleMixin();
-
-    NS_DECL_NSIACCESSIBLEDOCUMENT
-
-    NS_IMETHOD GetAccState(PRUint32 *aAccState);
-
-  protected:
-    nsCOMPtr<nsIDocument> mDocument;
-};
-
-class nsRootAccessible : public nsAccessible,
-                         public nsDocAccessibleMixin,
-                         public nsIAccessibleDocument,
-                         public nsIAccessibleEventReceiver,
-                         public nsIDOMFocusListener,
-                         public nsIDOMFormListener
-
-{
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsRootAccessible(nsIWeakReference* aShell);
-    virtual ~nsRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
-    NS_IMETHOD GetAccValue(nsAWritableString& aAccValue);
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-    NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
-    NS_IMETHOD GetAccState(PRUint32 *aAccState);
-
-    // ----- nsIAccessibleEventReceiver -------------------
-
-    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
-
-    // ----- nsIDOMEventListener --------------------------
-    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
-
-    // ----- nsIDOMFocusListener --------------------------
-    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
-    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
-
-    // ----- nsIDOMFormListener ---------------------------
-    NS_IMETHOD Submit(nsIDOMEvent* aEvent);
-    NS_IMETHOD Reset(nsIDOMEvent* aEvent);
-    NS_IMETHOD Change(nsIDOMEvent* aEvent);
-    NS_IMETHOD Select(nsIDOMEvent* aEvent);
-    NS_IMETHOD Input(nsIDOMEvent* aEvent);
-
-    NS_DECL_NSIACCESSIBLEDOCUMENT
-
-  protected:
-    NS_IMETHOD GetTargetNode(nsIDOMEvent *aEvent, nsCOMPtr<nsIDOMNode>& aTargetNode);
-    virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
-    virtual nsIFrame* GetFrame();
-
-    // not a com pointer. We don't own the listener
-    // it is the callers responsibility to remove the listener
-    // otherwise we will get into circular referencing problems
-    nsIAccessibleEventListener* mListener;
-    nsCOMPtr<nsIDOMNode> mCurrentFocus;
-    nsCOMPtr<nsIAccessibilityService> mAccService;
-};
-
-
-#endif  

mozilla/accessible/src/html/nsHTMLAreaAccessible.cpp

@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsHTMLAreaAccessible.h"
-#include "nsReadableUtils.h"
-#include "nsString.h"
-#include "nsAccessible.h"
-#include "nsIAccessibilityService.h"
-#include "nsIServiceManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMHTMLAreaElement.h"
-#include "nsGUIEvent.h"
-
-
-// --- area -----
-
-nsHTMLAreaAccessible::nsHTMLAreaAccessible(nsIDOMNode *aDomNode, nsIAccessible *aAccParent, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell), mAccParent(aAccParent)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAWritableString & _retval)
-{
-  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
-  if (elt) {
-    nsAutoString hrefString;
-    elt->GetAttribute(NS_LITERAL_STRING("title"), _retval);
-  }
-  return NS_OK;
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LINK;
-  return NS_OK;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAWritableString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
-  if (elt) 
-    elt->GetAttribute(NS_LITERAL_STRING("href"), _retval);
-  return NS_OK;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAWritableString& _retval)
-{
-  // Still to do - follow IE's standard here
-  nsCOMPtr<nsIDOMHTMLAreaElement> area(do_QueryInterface(mDOMNode));
-  if (area) 
-    area->GetShape(_retval);
-  return NS_OK;
-}
-
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  *aAccParent = mAccParent;
-  NS_IF_ADDREF(*aAccParent);
-  return NS_OK;
-}
-
-nsIAccessible *nsHTMLAreaAccessible::CreateAreaAccessible(nsIDOMNode *aDOMNode)
-{
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  if (accService) {
-    nsIAccessible* acc = nsnull;
-    accService->CreateHTMLAreaAccessible(mPresShell, aDOMNode, mAccParent, &acc);
-    return acc;
-  }
-  return nsnull;
-
-}
-
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
-{ 
-  *aAccNextSibling = nsnull;
-  nsCOMPtr<nsIDOMNode> nextNode;
-  mDOMNode->GetNextSibling(getter_AddRefs(nextNode));
-  if (nextNode)
-    *aAccNextSibling = CreateAreaAccessible(nextNode);
-  return NS_OK;  
-}
-
-/* readonly attribute nsIAccessible accPreviousSibling; */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPrevSibling) 
-{
-  *aAccPrevSibling = nsnull;
-  nsCOMPtr<nsIDOMNode> prevNode;
-  mDOMNode->GetPreviousSibling(getter_AddRefs(prevNode));
-  if (prevNode)
-    *aAccPrevSibling = CreateAreaAccessible(prevNode);
-  return NS_OK;  
-}
-
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsHTMLAreaAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  //nsIFrame *frame;
-  // Do a better job on this later - need to use GetRect on mAreas of nsImageMap from nsImageFrame
-  //return mAccParent->nsAccessible::AccGetBounds(x,y,width,height);
-
-  *x = *y = *width = *height = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/accessible/src/html/nsHTMLAreaAccessible.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLAreaAccessible_H_
-#define _nsHTMLAreaAccessible_H_
-
-#include "nsGenericAccessible.h"
-#include "nsAccessible.h"
-
-/* Accessible for image map areas - must be child of image
- */
-
-class nsHTMLAreaAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLAreaAccessible(nsIDOMNode *domNode, nsIAccessible *accParent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString & _retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible * *aAccNextSibling);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling);
-  NS_IMETHOD GetAccDescription(nsAWritableString& _retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-
-protected:
-  nsIAccessible *CreateAreaAccessible(nsIDOMNode *aDOMNode);
-  nsCOMPtr<nsIAccessible> mAccParent;
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp

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

mozilla/accessible/src/html/nsHTMLFormControlAccessible.h

@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLFormControlAccessible_H_
-#define _nsHTMLFormControlAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsICheckboxControlFrame;
-
-/* Accessible for supporting for controls
- * supports:
- * - walking up to get name from label
- * - support basic state
- */
-class nsHTMLFormControlAccessible : public nsLeafAccessible
-{
-
-public:
-  nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-
-protected:
-  NS_IMETHODIMP AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel);
-};
-
-class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-class nsHTML4ButtonAccessible : public nsHTMLBlockAccessible
-{
-
-public:
-  nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-
-class nsHTMLTextFieldAccessible : public nsHTMLFormControlAccessible
-{
-public:
-  nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLIFrameRootAccessible.cpp

@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsHTMLIFrameRootAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIDocShell.h"
-#include "nsIWebShell.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIXULDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMDocumentType.h"
-#include "nsINameSpaceManager.h"
-#include "nsReadableUtils.h"
-
-NS_INTERFACE_MAP_BEGIN(nsHTMLIFrameRootAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFormListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener)
-NS_INTERFACE_MAP_END_INHERITING(nsRootAccessible)
-
-NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
-NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
-
-NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
-NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
-
-
-NS_IMETHODIMP
-nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-  NS_ASSERTION(aInstancePtr, "QueryInterface requires a non-NULL destination!");
-  if ( !aInstancePtr )
-    return NS_ERROR_NULL_POINTER;
-  if (aIID.Equals(NS_GET_IID(nsIAccessibleDocument))) {
-    *aInstancePtr = (void*)(nsIAccessibleDocument*) this;
-    NS_IF_ADDREF(this);
-    return NS_OK;
-  }
-  return nsHTMLBlockAccessible::QueryInterface(aIID, aInstancePtr); 
-}
-
-
-nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *aDoc):
-  nsHTMLBlockAccessible(aNode, aShell), mRootAccessible(aRoot), nsDocAccessibleMixin(aDoc)
-{
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAWritableString& aAccName) 
-{ 
-  return GetTitle(aAccName);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAWritableString& aAccValue) 
-{ 
-  return GetURL(aAccValue);
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  return mRootAccessible->GetAccFirstChild(_retval);
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  return mRootAccessible->GetAccLastChild(_retval);
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  return mRootAccessible->GetAccChildCount(_retval);
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PANE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccState(PRUint32 *aAccState)
-{
-  return nsDocAccessibleMixin::GetAccState(aAccState);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAWritableString& aURL)
-{
-  return nsDocAccessibleMixin::GetURL(aURL);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAWritableString& aTitle)
-{
-  return nsDocAccessibleMixin::GetTitle(aTitle);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAWritableString& aMimeType)
-{
-  return nsDocAccessibleMixin::GetMimeType(aMimeType);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAWritableString& aDocType)
-{
-  return nsDocAccessibleMixin::GetDocType(aDocType);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
-{
-  return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocument(nsIDocument **doc)
-{
-  return nsDocAccessibleMixin::GetDocument(doc);
-}
-
-//=============================//
-// nsHTMLIFrameRootAccessible  //
-//=============================//
-
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsHTMLIFrameRootAccessible::nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-  nsRootAccessible(aShell)
-{
-  mRealDOMNode = aNode;
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsHTMLIFrameRootAccessible::~nsHTMLIFrameRootAccessible()
-{
-}
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccParent(nsIAccessible * *_retval) 
-{ 
-  nsCOMPtr<nsIAccessible> accessible;
-  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
-    return accessible->GetAccParent(_retval);
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-  /* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccNextSibling(nsIAccessible **_retval) 
-{
-  nsCOMPtr<nsIAccessible> accessible;
-
-  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
-    return accessible->GetAccNextSibling(_retval);
-
-  *_retval = nsnull;
-  return NS_ERROR_FAILURE;
-}
-
-  /* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccPreviousSibling(nsIAccessible **_retval) 
-{
-  nsCOMPtr<nsIAccessible> accessible;
-
-  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
-    return accessible->GetAccPreviousSibling(_retval);
-
-  *_retval = nsnull;
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetHTMLIFrameAccessible(nsIAccessible** aAcc)
-{
-  // Start by finding our PresShell and from that
-  // we get our nsIDocShell in order to walk the DocShell tree
-  nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mPresShell));
-  if (!presShell) {
-     *aAcc = nsnull;
-     return NS_ERROR_FAILURE;  
-  }
-
-  nsCOMPtr<nsIDocShell> docShell;
-  if (NS_SUCCEEDED(GetDocShellFromPS(presShell, getter_AddRefs(docShell)))) {
-    // Now that we have the DocShell QI 
-    // it to a tree item to find it's parent
-    nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(docShell));
-    if (item) {
-      nsCOMPtr<nsIDocShellTreeItem> itemParent;
-      item->GetParent(getter_AddRefs(itemParent));
-      // QI to get the WebShell for the parent document
-      nsCOMPtr<nsIDocShell> parentDocShell(do_QueryInterface(itemParent));
-      if (parentDocShell) {
-        // Get the PresShell/Content and 
-        // Root Content Node of the parent document
-        nsCOMPtr<nsIPresShell> parentPresShell;
-        nsCOMPtr<nsIPresContext> parentPresContext;
-        nsCOMPtr<nsIContent> rootContent;
-        if (NS_SUCCEEDED(GetDocShellObjects(parentDocShell,
-                                            getter_AddRefs(parentPresShell), 
-                                            getter_AddRefs(parentPresContext),
-                                            getter_AddRefs(rootContent)))) {
-          // QI the DocShell (of this sub-doc) to a webshell
-          nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(docShell));
-          if (webShell && parentPresShell && parentPresContext && rootContent) {
-            // Now, find the Content in the parent document
-            // that represents this sub-doc, 
-            // we do that matching webshells
-            nsCOMPtr<nsIContent> content;
-            if (FindContentForWebShell(parentPresShell, 
-                                       rootContent, 
-                                       webShell,
-                                       getter_AddRefs(content))) {
-              // OK, we found the content node in the parent doc
-              // that corresponds to this sub-doc
-              // Get the frame for that content
-              nsCOMPtr<nsIWeakReference> wr = do_GetWeakReference(parentPresShell);
-              nsIFrame* frame = nsnull;
-              parentPresShell->GetPrimaryFrameFor(content, &frame);
-#ifdef NS_DEBUG_X
-              printf("** Found: Con:%p  Fr:%p", content, frame);
-              char * name;
-              if (GetNameForFrame(frame, &name)) {
-                printf(" Name:[%s]", name);
-                nsMemory::Free(name);
-              }
-              printf("\n");
-#endif
-
-
-              nsCOMPtr<nsIDOMNode> node(do_QueryInterface(content));
-              nsCOMPtr<nsIAccessible> acc(do_QueryInterface(frame));
-
-              *aAcc = acc;
-              NS_IF_ADDREF(*aAcc);
-
-              return NS_OK;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  return NS_ERROR_FAILURE;
-}
-

mozilla/accessible/src/html/nsHTMLIFrameRootAccessible.h

@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsIFrameRootAccessible_H_
-#define _nsIFrameRootAccessible_H_
-
-#include "nsRootAccessible.h"
-#include "nsAccessible.h"
-#include "nsIAccessibleDocument.h"
-
-class nsIWebShell;
-class nsIWeakReference;
-
-class nsHTMLIFrameAccessible : public nsHTMLBlockAccessible, 
-                               public nsIAccessibleDocument,
-                               public nsDocAccessibleMixin
-{
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLEDOCUMENT
-
-  public:
-    nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *doc);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
-    NS_IMETHOD GetAccValue(nsAWritableString& AccValue);
-    NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
-    NS_IMETHOD GetAccState(PRUint32 *aAccState);
-
-  protected:
-    nsCOMPtr<nsIAccessible> mRootAccessible;
-};
-
-class nsHTMLIFrameRootAccessible : public nsRootAccessible
-{
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-    virtual ~nsHTMLIFrameRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-
-    /* nsIAccessible getAccNextSibling (); */
-    NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-
-    /* nsIAccessible getAccPreviousSibling (); */
-    NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-
-  protected:
-    NS_IMETHOD GetHTMLIFrameAccessible(nsIAccessible** aAcc);
-    nsCOMPtr<nsIDOMNode> mRealDOMNode;
-};
-
-
-#endif  

mozilla/accessible/src/html/nsHTMLImageAccessible.cpp

@@ -1,188 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsHTMLImageAccessible.h"
-#include "nsReadableUtils.h"
-#include "nsAccessible.h"
-#include "nsIHTMLDocument.h"
-#include "nsIDocument.h"
-#include "nsIDOMHTMLCollection.h"
-#include "nsIAccessibilityService.h"
-#include "nsIServiceManager.h"
-#include "imgIRequest.h"
-#include "imgIContainer.h"
-#include "nsIImageFrame.h"
-
-// --- image -----
-
-nsHTMLImageAccessible::nsHTMLImageAccessible(nsIDOMNode* aDOMNode, nsIImageFrame *aImageFrame, nsIWeakReference* aShell):
-nsLinkableAccessible(aDOMNode, aShell)
-{ 
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(aDOMNode));
-  nsCOMPtr<nsIDocument> doc;
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
-
-  shell->GetDocument(getter_AddRefs(doc));
-  nsAutoString mapElementName;
-
-  if (doc && element) {
-    nsCOMPtr<nsIHTMLDocument> htmlDoc(do_QueryInterface(doc));
-    element->GetAttribute(NS_LITERAL_STRING("usemap"),mapElementName);
-    if (htmlDoc && !mapElementName.IsEmpty()) {
-      if (mapElementName.CharAt(0) == '#')
-        mapElementName.Cut(0,1);
-      htmlDoc->GetImageMap(mapElementName, getter_AddRefs(mMapElement));      
-    }
-  }
-}
-
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval)
-{
-  // The state is a bitfield, get our inherited state, then logically OR it with STATE_ANIMATED if this
-  // is an animated image.
-
-  nsLinkableAccessible::GetAccState(_retval);
-
-  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  nsIFrame *frame = nsnull;
-  if (content && shell) 
-    shell->GetPrimaryFrameFor(content, &frame);
-
-  nsCOMPtr<nsIImageFrame> imageFrame(do_QueryInterface(frame));
-
-  nsCOMPtr<imgIRequest> imageRequest;
-  if (imageFrame) 
-    imageFrame->GetImageRequest(getter_AddRefs(imageRequest));
-  
-  nsCOMPtr<imgIContainer> imgContainer;
-  if (imageRequest) 
-    imageRequest->GetImage(getter_AddRefs(imgContainer));
-
-  if (imgContainer) {
-    PRUint32 numFrames;
-    imgContainer->GetNumFrames(&numFrames);
-    if (numFrames > 1)
-      *_retval |= STATE_ANIMATED;
-  }
-
-  return NS_OK;
-}
-
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAWritableString& _retval)
-{
-  nsresult rv = NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIContent> imageContent(do_QueryInterface(mDOMNode));
-  if (imageContent) {
-    nsAutoString name;
-    rv = AppendFlatStringFromContentNode(imageContent, &name);
-    if (NS_SUCCEEDED(rv)) {
-      // Temp var needed until CompressWhitespace built for nsAWritableString
-      name.CompressWhitespace();
-      _retval.Assign(name);
-    }
-  }
-  return rv;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_GRAPHIC;
-  return NS_OK;
-}
-
-
-nsIAccessible *nsHTMLImageAccessible::CreateAreaAccessible(PRUint32 areaNum)
-{
-  if (!mMapElement) 
-    return nsnull;
-
-   if (areaNum == -1) {
-    PRInt32 numAreaMaps;
-    GetAccChildCount(&numAreaMaps);
-    if (numAreaMaps<=0)
-      return nsnull;
-    areaNum = NS_STATIC_CAST(PRUint32,numAreaMaps-1);
-  }
-
-  nsIDOMHTMLCollection *mapAreas;
-  mMapElement->GetAreas(&mapAreas);
-  if (!mapAreas) 
-    return nsnull;
-
-  nsIDOMNode *domNode = nsnull;
-  mapAreas->Item(areaNum,&domNode);
-  if (!domNode)
-    return nsnull;
-
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  if (!accService)
-    return nsnull;
-  if (accService) {
-    nsIAccessible* acc = nsnull;
-    accService->CreateHTMLAreaAccessible(mPresShell, domNode, this, &acc);
-    return acc;
-  }
-  return nsnull;
-}
-
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = CreateAreaAccessible(0);
-  return NS_OK;
-}
-
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = CreateAreaAccessible(-1);
-  return NS_OK;
-}
-
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  if (mMapElement) {
-    nsIDOMHTMLCollection *mapAreas;
-    mMapElement->GetAreas(&mapAreas);
-    if (mapAreas) {
-      PRUint32 length;
-      mapAreas->GetLength(&length);
-      *_retval = NS_STATIC_CAST(PRInt32, length);
-    }
-  }
-
-  return NS_OK;
-}
-

mozilla/accessible/src/html/nsHTMLImageAccessible.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLImageAccessible_H_
-#define _nsHTMLImageAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIFrame.h"
-#include "nsIImageFrame.h"
-#include "nsIDOMHTMLMapElement.h"
-
-/* Accessible for supporting images
- * supports:
- * - gets name, role
- * - support basic state
- */
-class nsHTMLImageAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIImageFrame *imageFrame, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-protected:
-  nsIAccessible *CreateAreaAccessible(PRUint32 areaNum);
-  nsCOMPtr<nsIDOMHTMLMapElement> mMapElement;
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLLinkAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsILink.h"
-#include "nsILinkHandler.h"
-#include "nsISelection.h"
-#include "nsISelectionController.h"
-#include "nsIPresContext.h"
-#include "nsReadableUtils.h"
-#include "nsIDOMElement.h"
-
-nsHTMLLinkAccessible::nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAWritableString& _retval)
-{ 
-  if (!IsALink())  // Also initializes private data members
-    return NS_ERROR_FAILURE;
-
-  nsAutoString name;
-  nsresult rv = AppendFlatStringFromSubtree(mLinkContent, &name);
-  if (NS_SUCCEEDED(rv)) {
-    // Temp var needed until CompressWhitespace built for nsAWritableString
-    name.CompressWhitespace();
-    _retval.Assign(name);
-  }
-  return rv;
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLLinkAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LINK;
-
-  return NS_OK;
-}
-

mozilla/accessible/src/html/nsHTMLLinkAccessible.h

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- * Author: Aaron Leventhal (aaronl@netscape.com)
- */
-
-#ifndef _nsHTMLLinkAccessible_H_
-#define _nsHTMLLinkAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsHTMLLinkAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp

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

mozilla/accessible/src/html/nsHTMLSelectAccessible.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsHTMLSelectAccessible_h__
-#define __nsHTMLSelectAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-#include "nsIAccessibleSelectable.h"
-
-class nsHTMLSelectAccessible : public nsAccessible,
-                               public nsIAccessibleSelectable  
-{
-public:
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLESELECTABLE
-  
-  nsHTMLSelectAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLSelectAccessible() {}
-
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-// helper method to verify frames
-  static PRBool IsCorrectFrame( nsIFrame* aFrame, nsIAtom* aAtom );
-
-};
-
-/*
- * Each option in the Select. These are in the nsListAccessible
- */
-class nsHTMLSelectOptionAccessible : public nsLeafAccessible
-{
-public:
-  
-  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval);
-
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-#endif

mozilla/accessible/src/html/nsHTMLTableAccessible.cpp

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTableAccessible.h"
-#include "nsWeakReference.h"
-#include "nsReadableUtils.h"
-
-nsHTMLTableCellAccessible::nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsHTMLBlockAccessible(aDomNode, aShell)
-{ 
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_CELL;
-  return NS_OK;
-}
-
-nsHTMLTableAccessible::nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsHTMLBlockAccessible(aDomNode, aShell)
-{ 
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTableAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_TABLE;
-  return NS_OK;
-}
-

mozilla/accessible/src/html/nsHTMLTableAccessible.h

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLTableAccessible_H_
-#define _nsHTMLTableAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsHTMLTableCellAccessible : public nsHTMLBlockAccessible
-{
-public:
-  nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-
-class nsHTMLTableAccessible : public nsHTMLBlockAccessible
-{
-public:
-  nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLTextAccessible.cpp

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTextAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsString.h"
-#include "nsILink.h"
-#include "nsILinkHandler.h"
-#include "nsISelection.h"
-#include "nsISelectionController.h"
-#include "nsIPresContext.h"
-#include "nsReadableUtils.h"
-
-nsHTMLTextAccessible::nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval)
-{ 
-
-  return mDOMNode->GetNodeValue(_retval);
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_TEXT;
-
-  return NS_OK;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLTextAccessible.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLTextAccessible_H_
-#define _nsHTMLTextAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsIWeakReference;
-class nsITextControlFrame;
-
-class nsHTMLTextAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/jar.mn

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

mozilla/accessible/src/makefile.win

@@ -1,64 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-MODULE=accessibility
-LIBRARY_NAME=accessibility_s
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsAccessible.obj    \
-        .\$(OBJDIR)\nsRootAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLIFrameRootAccessible.obj    \
-        .\$(OBJDIR)\nsAccessibilityService.obj    \
-        .\$(OBJDIR)\nsHTMLSelectListAccessible.obj    \
-        .\$(OBJDIR)\nsGenericAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLFormControlAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLTextAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLImageAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLAreaAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLTableAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLLinkAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLComboboxAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLListboxAccessible.obj    \
-  $(NULL)
-
-EXPORTS = \
-  .\nsRootAccessible.h \
-  $(NULL)
-
-LINCS=                                  \
-  -I..\..\layout\html\forms\public \
-  -I..\..\layout\html\forms\src \
-  -I..\..\layout\html\base\src \
-  $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-
-
-

mozilla/accessible/src/nsAccessibilityService.cpp

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

mozilla/accessible/src/nsAccessibilityService.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#ifndef __nsAccessibilityService_h__
-#define __nsAccessibilityService_h__
-
-#include "nsIAccessibilityService.h"
-#include "nsIContent.h"
-#include "nsIPresShell.h"
-#include "nsIDocShell.h"
-
-class nsIFrame;
-class nsIWeakReference;
-class nsIDOMNode;
-
-class nsAccessibilityService : public nsIAccessibilityService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBILITYSERVICE
-
-  // nsAccessibilityService methods:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
-public:
-
-private:
-  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aContent);
-  void GetOwnerFor(nsIPresShell *aPresShell, nsIPresShell **aOwnerShell, nsIContent **aOwnerContent);
-  nsIContent* FindContentForDocShell(nsIPresShell* aPresShell, nsIContent* aContent, nsIDocShell*  aDocShell);
-
-};
-
-#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/nsAccessible.h

@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsAccessible_H_
-#define _nsAccessible_H_
-
-#include "nsISupports.h"
-#include "nsGenericAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsWeakReference.h"
-#include "nsIFocusController.h"
-#include "nsRect.h"
-#include "nsPoint.h"
-
-#define ACCESSIBLE_BUNDLE_URL "chrome://global/locale/accessible.properties"
-
-class nsIFrame;
-class nsIDocShell;
-class nsIWebShell;
-class nsIContent;
-
-class nsAccessible : public nsGenericAccessible
-{
-public:
-  NS_IMETHOD GetAccName(nsAWritableString& _retval);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); 
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFocused(nsIAccessible **_retval); 
-  NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval); 
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); 
-  NS_IMETHOD AccRemoveSelection(void); 
-  NS_IMETHOD AccTakeSelection(void); 
-  NS_IMETHOD AccTakeFocus(void); 
-  NS_IMETHOD AccGetDOMNode(nsIDOMNode **_retval); 
-
-  public:
-    nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-    virtual ~nsAccessible();
-
-    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
-
-    // Helper Routines for Sub-Docs
-    static nsresult GetDocShellFromPS(nsIPresShell* aPresShell, nsIDocShell** aDocShell);
-    static nsresult GetDocShellObjects(nsIDocShell*     aDocShell,
-                                nsIPresShell**   aPresShell, 
-                                nsIPresContext** aPresContext, 
-                                nsIContent**     aContent);
-    static nsresult GetDocShells(nsIPresShell* aPresShell,
-                          nsIDocShell** aDocShell,
-                          nsIDocShell** aParentDocShell);
-    static nsresult GetParentPresShellAndContent(nsIPresShell*  aPresShell,
-                                          nsIPresShell** aParentPresShell,
-                                          nsIContent**   aSubShellContent);
-
-    static PRBool FindContentForWebShell(nsIPresShell* aParentPresShell,
-                                  nsIContent*   aParentContent,
-                                  nsIWebShell*  aWebShell,
-                                  nsIContent**  aFoundContent);
-    nsresult CalcOffset(nsIFrame* aFrame,
-                        nsIPresContext * aPresContext,
-                        nsRect& aRect);
-    nsresult GetAbsPosition(nsIPresShell* aPresShell, nsPoint& aPoint);
-    nsresult GetAbsoluteFramePosition(nsIPresContext* aPresContext,
-                                      nsIFrame *aFrame, 
-                                      nsRect& aAbsoluteTwipsRect, 
-                                      nsRect& aAbsolutePixelRect);
-    static nsresult GetTranslatedString(PRUnichar *aKey, nsAWritableString *aStringOut);
-
-    // helper method to verify frames
-    static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom);
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIFrame* GetBoundsFrame();
-  virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
-  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString);
-  NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString);
-
-  // Data Members
-  nsCOMPtr<nsIDOMNode> mDOMNode;
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIFocusController> mFocusController;
-
-};
-
-/* Special Accessible that knows how to handle hit detection for flowing text */
-class nsHTMLBlockAccessible : public nsAccessible
-{
-public:
-   nsHTMLBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-};
-
-/* Leaf version of DOM Accessible
- * has no children
- */
-class nsLeafAccessible : public nsAccessible
-{
-  public:
-    nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-
-class nsLinkableAccessible : public nsAccessible
-{
-  public:
-    nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-    NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-    NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-    NS_IMETHOD AccDoAction(PRUint8 index);
-    NS_IMETHOD GetAccState(PRUint32 *_retval);
-    NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-
-  protected:
-    PRBool IsALink();
-    PRBool mIsALinkCached;  // -1 = unknown, 0 = not a link, 1 = is a link
-    nsCOMPtr<nsIContent> mLinkContent;
-    PRBool mIsLinkVisited;
-};
-
-
-#endif  

mozilla/accessible/src/nsGenericAccessible.cpp

@@ -1,225 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsIFrame.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-#include "nsISelectionController.h"
-#include "nsReadableUtils.h"
-#include "nsIContent.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
-
-nsGenericAccessible::nsGenericAccessible()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-nsGenericAccessible::~nsGenericAccessible()
-{
-  /* destructor code */
-}
-
-/* nsIAccessible getAccParent (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAReadableString& name)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* PRUint8 getAccNumActions (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNumActions(PRUint8 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccActionName (in PRUint8 index); */
-NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accDoAction (in PRUint8 index); */
-NS_IMETHODIMP nsGenericAccessible::AccDoAction(PRUint8 index)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFocused(); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFocused(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAWritableString& _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateRight (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateLeft (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateUp (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateDown (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accAddSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accExtendSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccExtState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsGenericAccessible::AccGetDOMNode(nsIDOMNode **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-

mozilla/accessible/src/nsGenericAccessible.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsGenericAccessible_H_
-#define _nsGenericAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/**
- * Basic implementation
- * supports nothing
- */
-class nsGenericAccessible : public nsIAccessible
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-
-  public:
-    nsGenericAccessible();
-    virtual ~nsGenericAccessible();
-};
-
-
-#endif  

mozilla/accessible/src/nsHTMLAreaAccessible.cpp

@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsHTMLAreaAccessible.h"
-#include "nsReadableUtils.h"
-#include "nsString.h"
-#include "nsAccessible.h"
-#include "nsIAccessibilityService.h"
-#include "nsIServiceManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMHTMLAreaElement.h"
-#include "nsGUIEvent.h"
-
-
-// --- area -----
-
-nsHTMLAreaAccessible::nsHTMLAreaAccessible(nsIDOMNode *aDomNode, nsIAccessible *aAccParent, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell), mAccParent(aAccParent)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAWritableString & _retval)
-{
-  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
-  if (elt) {
-    nsAutoString hrefString;
-    elt->GetAttribute(NS_LITERAL_STRING("title"), _retval);
-  }
-  return NS_OK;
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LINK;
-  return NS_OK;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAWritableString& _retval)
-{
-  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(mDOMNode));
-  if (elt) 
-    elt->GetAttribute(NS_LITERAL_STRING("href"), _retval);
-  return NS_OK;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAWritableString& _retval)
-{
-  // Still to do - follow IE's standard here
-  nsCOMPtr<nsIDOMHTMLAreaElement> area(do_QueryInterface(mDOMNode));
-  if (area) 
-    area->GetShape(_retval);
-  return NS_OK;
-}
-
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  *aAccParent = mAccParent;
-  NS_IF_ADDREF(*aAccParent);
-  return NS_OK;
-}
-
-nsIAccessible *nsHTMLAreaAccessible::CreateAreaAccessible(nsIDOMNode *aDOMNode)
-{
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  if (accService) {
-    nsIAccessible* acc = nsnull;
-    accService->CreateHTMLAreaAccessible(mPresShell, aDOMNode, mAccParent, &acc);
-    return acc;
-  }
-  return nsnull;
-
-}
-
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
-{ 
-  *aAccNextSibling = nsnull;
-  nsCOMPtr<nsIDOMNode> nextNode;
-  mDOMNode->GetNextSibling(getter_AddRefs(nextNode));
-  if (nextNode)
-    *aAccNextSibling = CreateAreaAccessible(nextNode);
-  return NS_OK;  
-}
-
-/* readonly attribute nsIAccessible accPreviousSibling; */
-NS_IMETHODIMP nsHTMLAreaAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPrevSibling) 
-{
-  *aAccPrevSibling = nsnull;
-  nsCOMPtr<nsIDOMNode> prevNode;
-  mDOMNode->GetPreviousSibling(getter_AddRefs(prevNode));
-  if (prevNode)
-    *aAccPrevSibling = CreateAreaAccessible(prevNode);
-  return NS_OK;  
-}
-
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsHTMLAreaAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  //nsIFrame *frame;
-  // Do a better job on this later - need to use GetRect on mAreas of nsImageMap from nsImageFrame
-  //return mAccParent->nsAccessible::AccGetBounds(x,y,width,height);
-
-  *x = *y = *width = *height = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/accessible/src/nsHTMLAreaAccessible.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLAreaAccessible_H_
-#define _nsHTMLAreaAccessible_H_
-
-#include "nsGenericAccessible.h"
-#include "nsAccessible.h"
-
-/* Accessible for image map areas - must be child of image
- */
-
-class nsHTMLAreaAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLAreaAccessible(nsIDOMNode *domNode, nsIAccessible *accParent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString & _retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible * *aAccNextSibling);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling);
-  NS_IMETHOD GetAccDescription(nsAWritableString& _retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-
-protected:
-  nsIAccessible *CreateAreaAccessible(nsIDOMNode *aDOMNode);
-  nsCOMPtr<nsIAccessible> mAccParent;
-};
-
-#endif  

mozilla/accessible/src/nsHTMLComboboxAccessible.cpp

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

mozilla/accessible/src/nsHTMLComboboxAccessible.h

@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: John Gaunt (jgaunt@netscape.com)
- *
- * Contributor(s):
- */
-#ifndef __nsHTMLComboboxAccessible_h__
-#define __nsHTMLComboboxAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsIAccessibleSelectable.h"
-
-#include "nsCOMPtr.h"
-#include "nsHTMLSelectListAccessible.h"
-#include "nsIDOMXULListener.h"
-
-/*
- * A class the represents the HTML Combobox widget.
- */
-class nsHTMLComboboxAccessible : public nsAccessible,
-                                 public nsIAccessibleSelectable,
-                                 public nsIDOMXULListener
-{
-public:
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLESELECTABLE
-  
-  nsHTMLComboboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLComboboxAccessible();
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  // popup listener
-  NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent);
-  NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent);
-  NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; }
-  
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  virtual void SetupMenuListener();
-
-protected:
-
-  PRBool mRegistered;
-  PRBool mOpen;
-
-};
-
-/*
- * A class the represents the text field in the Select to the left
- *     of the drop down button
- */
-class nsHTMLComboboxTextFieldAccessible  : public nsLeafAccessible
-{
-public:
-  
-  nsHTMLComboboxTextFieldAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/**
-  * A class that represents the button inside the Select to the
-  *     right of the text field
-  */
-class nsHTMLComboboxButtonAccessible  : public nsAccessible
-{
-public:
-
-  enum { eAction_Click=0 };
-  
-  nsHTMLComboboxButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/*
- * A class that represents the window that lives to the right
- * of the drop down button inside the Select. This is the window
- * that is made visible when the button is pressed.
- */
-class nsHTMLComboboxWindowAccessible : public nsAccessible
-{
-public:
-
-  nsHTMLComboboxWindowAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-  virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame);
-   
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent; 
-};
-
-#endif

mozilla/accessible/src/nsHTMLFormControlAccessible.cpp

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

mozilla/accessible/src/nsHTMLFormControlAccessible.h

@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLFormControlAccessible_H_
-#define _nsHTMLFormControlAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsICheckboxControlFrame;
-
-/* Accessible for supporting for controls
- * supports:
- * - walking up to get name from label
- * - support basic state
- */
-class nsHTMLFormControlAccessible : public nsLeafAccessible
-{
-
-public:
-  nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-
-protected:
-  NS_IMETHODIMP AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel);
-};
-
-class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-class nsHTML4ButtonAccessible : public nsHTMLBlockAccessible
-{
-
-public:
-  nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccNumActions(PRUint8 *_retval);
-  NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval);
-  NS_IMETHOD AccDoAction(PRUint8 index);
-};
-
-
-class nsHTMLTextFieldAccessible : public nsHTMLFormControlAccessible
-{
-public:
-  nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/nsHTMLIFrameRootAccessible.cpp

@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsHTMLIFrameRootAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIDocShell.h"
-#include "nsIWebShell.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIXULDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMDocumentType.h"
-#include "nsINameSpaceManager.h"
-#include "nsReadableUtils.h"
-
-NS_INTERFACE_MAP_BEGIN(nsHTMLIFrameRootAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMFormListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener)
-NS_INTERFACE_MAP_END_INHERITING(nsRootAccessible)
-
-NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
-NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameRootAccessible, nsRootAccessible);
-
-NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
-NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameAccessible, nsHTMLBlockAccessible);
-
-
-NS_IMETHODIMP
-nsHTMLIFrameAccessible::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-  NS_ASSERTION(aInstancePtr, "QueryInterface requires a non-NULL destination!");
-  if ( !aInstancePtr )
-    return NS_ERROR_NULL_POINTER;
-  if (aIID.Equals(NS_GET_IID(nsIAccessibleDocument))) {
-    *aInstancePtr = (void*)(nsIAccessibleDocument*) this;
-    NS_IF_ADDREF(this);
-    return NS_OK;
-  }
-  return nsHTMLBlockAccessible::QueryInterface(aIID, aInstancePtr); 
-}
-
-
-nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *aDoc):
-  nsHTMLBlockAccessible(aNode, aShell), mRootAccessible(aRoot), nsDocAccessibleMixin(aDoc)
-{
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAWritableString& aAccName) 
-{ 
-  return GetTitle(aAccName);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAWritableString& aAccValue) 
-{ 
-  return GetURL(aAccValue);
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  return mRootAccessible->GetAccFirstChild(_retval);
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  return mRootAccessible->GetAccLastChild(_retval);
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  return mRootAccessible->GetAccChildCount(_retval);
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_PANE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccState(PRUint32 *aAccState)
-{
-  return nsDocAccessibleMixin::GetAccState(aAccState);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAWritableString& aURL)
-{
-  return nsDocAccessibleMixin::GetURL(aURL);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAWritableString& aTitle)
-{
-  return nsDocAccessibleMixin::GetTitle(aTitle);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAWritableString& aMimeType)
-{
-  return nsDocAccessibleMixin::GetMimeType(aMimeType);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAWritableString& aDocType)
-{
-  return nsDocAccessibleMixin::GetDocType(aDocType);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI)
-{
-  return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI);
-}
-
-NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocument(nsIDocument **doc)
-{
-  return nsDocAccessibleMixin::GetDocument(doc);
-}
-
-//=============================//
-// nsHTMLIFrameRootAccessible  //
-//=============================//
-
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsHTMLIFrameRootAccessible::nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
-  nsRootAccessible(aShell)
-{
-  mRealDOMNode = aNode;
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsHTMLIFrameRootAccessible::~nsHTMLIFrameRootAccessible()
-{
-}
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccParent(nsIAccessible * *_retval) 
-{ 
-  nsCOMPtr<nsIAccessible> accessible;
-  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
-    return accessible->GetAccParent(_retval);
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-  /* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccNextSibling(nsIAccessible **_retval) 
-{
-  nsCOMPtr<nsIAccessible> accessible;
-
-  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
-    return accessible->GetAccNextSibling(_retval);
-
-  *_retval = nsnull;
-  return NS_ERROR_FAILURE;
-}
-
-  /* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetAccPreviousSibling(nsIAccessible **_retval) 
-{
-  nsCOMPtr<nsIAccessible> accessible;
-
-  if (NS_SUCCEEDED(GetHTMLIFrameAccessible(getter_AddRefs(accessible))))
-    return accessible->GetAccPreviousSibling(_retval);
-
-  *_retval = nsnull;
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsHTMLIFrameRootAccessible::GetHTMLIFrameAccessible(nsIAccessible** aAcc)
-{
-  // Start by finding our PresShell and from that
-  // we get our nsIDocShell in order to walk the DocShell tree
-  nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mPresShell));
-  if (!presShell) {
-     *aAcc = nsnull;
-     return NS_ERROR_FAILURE;  
-  }
-
-  nsCOMPtr<nsIDocShell> docShell;
-  if (NS_SUCCEEDED(GetDocShellFromPS(presShell, getter_AddRefs(docShell)))) {
-    // Now that we have the DocShell QI 
-    // it to a tree item to find it's parent
-    nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(docShell));
-    if (item) {
-      nsCOMPtr<nsIDocShellTreeItem> itemParent;
-      item->GetParent(getter_AddRefs(itemParent));
-      // QI to get the WebShell for the parent document
-      nsCOMPtr<nsIDocShell> parentDocShell(do_QueryInterface(itemParent));
-      if (parentDocShell) {
-        // Get the PresShell/Content and 
-        // Root Content Node of the parent document
-        nsCOMPtr<nsIPresShell> parentPresShell;
-        nsCOMPtr<nsIPresContext> parentPresContext;
-        nsCOMPtr<nsIContent> rootContent;
-        if (NS_SUCCEEDED(GetDocShellObjects(parentDocShell,
-                                            getter_AddRefs(parentPresShell), 
-                                            getter_AddRefs(parentPresContext),
-                                            getter_AddRefs(rootContent)))) {
-          // QI the DocShell (of this sub-doc) to a webshell
-          nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(docShell));
-          if (webShell && parentPresShell && parentPresContext && rootContent) {
-            // Now, find the Content in the parent document
-            // that represents this sub-doc, 
-            // we do that matching webshells
-            nsCOMPtr<nsIContent> content;
-            if (FindContentForWebShell(parentPresShell, 
-                                       rootContent, 
-                                       webShell,
-                                       getter_AddRefs(content))) {
-              // OK, we found the content node in the parent doc
-              // that corresponds to this sub-doc
-              // Get the frame for that content
-              nsCOMPtr<nsIWeakReference> wr = do_GetWeakReference(parentPresShell);
-              nsIFrame* frame = nsnull;
-              parentPresShell->GetPrimaryFrameFor(content, &frame);
-#ifdef NS_DEBUG_X
-              printf("** Found: Con:%p  Fr:%p", content, frame);
-              char * name;
-              if (GetNameForFrame(frame, &name)) {
-                printf(" Name:[%s]", name);
-                nsMemory::Free(name);
-              }
-              printf("\n");
-#endif
-
-
-              nsCOMPtr<nsIDOMNode> node(do_QueryInterface(content));
-              nsCOMPtr<nsIAccessible> acc(do_QueryInterface(frame));
-
-              *aAcc = acc;
-              NS_IF_ADDREF(*aAcc);
-
-              return NS_OK;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  return NS_ERROR_FAILURE;
-}
-

mozilla/accessible/src/nsHTMLIFrameRootAccessible.h

@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsIFrameRootAccessible_H_
-#define _nsIFrameRootAccessible_H_
-
-#include "nsRootAccessible.h"
-#include "nsAccessible.h"
-#include "nsIAccessibleDocument.h"
-
-class nsIWebShell;
-class nsIWeakReference;
-
-class nsHTMLIFrameAccessible : public nsHTMLBlockAccessible, 
-                               public nsIAccessibleDocument,
-                               public nsDocAccessibleMixin
-{
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLEDOCUMENT
-
-  public:
-    nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* aRoot, nsIWeakReference* aShell, nsIDocument *doc);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
-    NS_IMETHOD GetAccValue(nsAWritableString& AccValue);
-    NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
-    NS_IMETHOD GetAccState(PRUint32 *aAccState);
-
-  protected:
-    nsCOMPtr<nsIAccessible> mRootAccessible;
-};
-
-class nsHTMLIFrameRootAccessible : public nsRootAccessible
-{
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsHTMLIFrameRootAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
-    virtual ~nsHTMLIFrameRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-
-    /* nsIAccessible getAccNextSibling (); */
-    NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-
-    /* nsIAccessible getAccPreviousSibling (); */
-    NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-
-  protected:
-    NS_IMETHOD GetHTMLIFrameAccessible(nsIAccessible** aAcc);
-    nsCOMPtr<nsIDOMNode> mRealDOMNode;
-};
-
-
-#endif  

mozilla/accessible/src/nsHTMLImageAccessible.cpp

@@ -1,188 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsHTMLImageAccessible.h"
-#include "nsReadableUtils.h"
-#include "nsAccessible.h"
-#include "nsIHTMLDocument.h"
-#include "nsIDocument.h"
-#include "nsIDOMHTMLCollection.h"
-#include "nsIAccessibilityService.h"
-#include "nsIServiceManager.h"
-#include "imgIRequest.h"
-#include "imgIContainer.h"
-#include "nsIImageFrame.h"
-
-// --- image -----
-
-nsHTMLImageAccessible::nsHTMLImageAccessible(nsIDOMNode* aDOMNode, nsIImageFrame *aImageFrame, nsIWeakReference* aShell):
-nsLinkableAccessible(aDOMNode, aShell)
-{ 
-  nsCOMPtr<nsIDOMElement> element(do_QueryInterface(aDOMNode));
-  nsCOMPtr<nsIDocument> doc;
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  NS_ASSERTION(shell,"Shell is gone!!! What are we doing here?");
-
-  shell->GetDocument(getter_AddRefs(doc));
-  nsAutoString mapElementName;
-
-  if (doc && element) {
-    nsCOMPtr<nsIHTMLDocument> htmlDoc(do_QueryInterface(doc));
-    element->GetAttribute(NS_LITERAL_STRING("usemap"),mapElementName);
-    if (htmlDoc && !mapElementName.IsEmpty()) {
-      if (mapElementName.CharAt(0) == '#')
-        mapElementName.Cut(0,1);
-      htmlDoc->GetImageMap(mapElementName, getter_AddRefs(mMapElement));      
-    }
-  }
-}
-
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval)
-{
-  // The state is a bitfield, get our inherited state, then logically OR it with STATE_ANIMATED if this
-  // is an animated image.
-
-  nsLinkableAccessible::GetAccState(_retval);
-
-  nsCOMPtr<nsIContent> content(do_QueryInterface(mDOMNode));
-  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mPresShell));
-  nsIFrame *frame = nsnull;
-  if (content && shell) 
-    shell->GetPrimaryFrameFor(content, &frame);
-
-  nsCOMPtr<nsIImageFrame> imageFrame(do_QueryInterface(frame));
-
-  nsCOMPtr<imgIRequest> imageRequest;
-  if (imageFrame) 
-    imageFrame->GetImageRequest(getter_AddRefs(imageRequest));
-  
-  nsCOMPtr<imgIContainer> imgContainer;
-  if (imageRequest) 
-    imageRequest->GetImage(getter_AddRefs(imgContainer));
-
-  if (imgContainer) {
-    PRUint32 numFrames;
-    imgContainer->GetNumFrames(&numFrames);
-    if (numFrames > 1)
-      *_retval |= STATE_ANIMATED;
-  }
-
-  return NS_OK;
-}
-
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAWritableString& _retval)
-{
-  nsresult rv = NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIContent> imageContent(do_QueryInterface(mDOMNode));
-  if (imageContent) {
-    nsAutoString name;
-    rv = AppendFlatStringFromContentNode(imageContent, &name);
-    if (NS_SUCCEEDED(rv)) {
-      // Temp var needed until CompressWhitespace built for nsAWritableString
-      name.CompressWhitespace();
-      _retval.Assign(name);
-    }
-  }
-  return rv;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_GRAPHIC;
-  return NS_OK;
-}
-
-
-nsIAccessible *nsHTMLImageAccessible::CreateAreaAccessible(PRUint32 areaNum)
-{
-  if (!mMapElement) 
-    return nsnull;
-
-   if (areaNum == -1) {
-    PRInt32 numAreaMaps;
-    GetAccChildCount(&numAreaMaps);
-    if (numAreaMaps<=0)
-      return nsnull;
-    areaNum = NS_STATIC_CAST(PRUint32,numAreaMaps-1);
-  }
-
-  nsIDOMHTMLCollection *mapAreas;
-  mMapElement->GetAreas(&mapAreas);
-  if (!mapAreas) 
-    return nsnull;
-
-  nsIDOMNode *domNode = nsnull;
-  mapAreas->Item(areaNum,&domNode);
-  if (!domNode)
-    return nsnull;
-
-  nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-  if (!accService)
-    return nsnull;
-  if (accService) {
-    nsIAccessible* acc = nsnull;
-    accService->CreateHTMLAreaAccessible(mPresShell, domNode, this, &acc);
-    return acc;
-  }
-  return nsnull;
-}
-
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = CreateAreaAccessible(0);
-  return NS_OK;
-}
-
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = CreateAreaAccessible(-1);
-  return NS_OK;
-}
-
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLImageAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  if (mMapElement) {
-    nsIDOMHTMLCollection *mapAreas;
-    mMapElement->GetAreas(&mapAreas);
-    if (mapAreas) {
-      PRUint32 length;
-      mapAreas->GetLength(&length);
-      *_retval = NS_STATIC_CAST(PRInt32, length);
-    }
-  }
-
-  return NS_OK;
-}
-

mozilla/accessible/src/nsHTMLImageAccessible.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLImageAccessible_H_
-#define _nsHTMLImageAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIFrame.h"
-#include "nsIImageFrame.h"
-#include "nsIDOMHTMLMapElement.h"
-
-/* Accessible for supporting images
- * supports:
- * - gets name, role
- * - support basic state
- */
-class nsHTMLImageAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIImageFrame *imageFrame, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-protected:
-  nsIAccessible *CreateAreaAccessible(PRUint32 areaNum);
-  nsCOMPtr<nsIDOMHTMLMapElement> mMapElement;
-};
-
-#endif  

mozilla/accessible/src/nsHTMLLinkAccessible.cpp

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLLinkAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsILink.h"
-#include "nsILinkHandler.h"
-#include "nsISelection.h"
-#include "nsISelectionController.h"
-#include "nsIPresContext.h"
-#include "nsReadableUtils.h"
-#include "nsIDOMElement.h"
-
-nsHTMLLinkAccessible::nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAWritableString& _retval)
-{ 
-  if (!IsALink())  // Also initializes private data members
-    return NS_ERROR_FAILURE;
-
-  nsAutoString name;
-  nsresult rv = AppendFlatStringFromSubtree(mLinkContent, &name);
-  if (NS_SUCCEEDED(rv)) {
-    // Temp var needed until CompressWhitespace built for nsAWritableString
-    name.CompressWhitespace();
-    _retval.Assign(name);
-  }
-  return rv;
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLLinkAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_LINK;
-
-  return NS_OK;
-}
-

mozilla/accessible/src/nsHTMLLinkAccessible.h

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- * Author: Aaron Leventhal (aaronl@netscape.com)
- */
-
-#ifndef _nsHTMLLinkAccessible_H_
-#define _nsHTMLLinkAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsHTMLLinkAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-#endif  

mozilla/accessible/src/nsHTMLListboxAccessible.cpp

@@ -1,183 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsHTMLListboxAccessible.h"
-
-#include "nsCOMPtr.h"
-#include "nsIAccessibilityService.h"
-#include "nsIDOMHTMLCollection.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMHTMLSelectElement.h"
-#include "nsIDOMHTMLOptionElement.h"
-#include "nsIFrame.h"
-#include "nsIServiceManager.h"
-#include "nsLayoutAtoms.h"
-
-/** ----- nsHTMLListboxAccessible ----- */
-
-/**
-  * Constructor -- create the nsHTMLAccessible
-  */
-nsHTMLListboxAccessible::nsHTMLListboxAccessible(nsIDOMNode* aDOMNode, 
-                                                   nsIWeakReference* aShell)
-                        :nsAccessible(aDOMNode, aShell)
-{
-}
-
-/** Inherit the ISupports impl from nsAccessible */
-NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLListboxAccessible, nsAccessible, nsIAccessibleSelectable)
-
-/** 
-  * Tell our caller we are a list ( there isn't a listbox value )
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_WINDOW;
-  return NS_OK;
-}
-
-/** 
-  * Through the arg, pass back our last child, a nsHTMLListboxWindowAccessible object
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
-  if ( ! *_retval )
-    return NS_ERROR_FAILURE;
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-/** 
-  * Through the arg, pass back our first child, a nsHTMLListboxWindowAccessible object
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = new nsHTMLSelectListAccessible(this, mDOMNode, mPresShell);
-  if ( ! *_retval )
-    return NS_ERROR_FAILURE;
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-/**
-  * We always have 1 child: SelectList.
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/**
-  * nsIAccessibleSelectable method. This needs to get from the select the list
-  *     of select options and then iterate through that pulling out the selected
-  *     items and creating IAccessible objects for them. Put the IAccessibles in
-  *     the nsISupportsArray and return them.
-  * retval will be nsnull if:
-  *    - there are no options in the select
-  *    - there are options but none are selected
-  *    - the DOMNode is not a nsIDOMHTMLSelectElement ( shouldn't happen )
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetSelectedChildren(nsISupportsArray **_retval)
-{
-  nsCOMPtr<nsIDOMHTMLSelectElement> select(do_QueryInterface(mDOMNode));
-  if(select) {
-    nsCOMPtr<nsIDOMHTMLCollection> options;
-    // get all the options in the select
-    select->GetOptions(getter_AddRefs(options));
-    if (options) {
-      // set up variables we need to get the selected options and to get their nsIAccessile objects
-      PRUint32 length;
-      options->GetLength(&length);
-      nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
-      nsCOMPtr<nsISupportsArray> selectedAccessibles;
-      NS_NewISupportsArray(getter_AddRefs(selectedAccessibles));
-      if (!selectedAccessibles || !accService)
-        return NS_ERROR_FAILURE;
-      // find the selected options and get the accessible objects;
-      PRBool isSelected = PR_FALSE;
-      nsCOMPtr<nsIPresContext> context;
-      GetPresContext(context);
-      for (PRUint32 i = 0 ; i < length ; i++) {
-        nsCOMPtr<nsIDOMNode> tempNode;
-        options->Item(i,getter_AddRefs(tempNode));
-        if (tempNode) {
-          nsCOMPtr<nsIDOMHTMLOptionElement> tempOption(do_QueryInterface(tempNode));
-          if (tempOption)
-            tempOption->GetSelected(&isSelected);
-          if (isSelected) {
-            nsCOMPtr<nsIAccessible> tempAccess;
-            accService->CreateHTMLSelectOptionAccessible(tempOption, this, context, getter_AddRefs(tempAccess));
-            if ( tempAccess )
-              selectedAccessibles->AppendElement(tempAccess);
-            isSelected = PR_FALSE;
-          }
-        }
-      }
-      selectedAccessibles->Count(&length); // reusing length
-      if ( length != 0 ) { // length of nsISupportsArray containing selected options
-        *_retval = selectedAccessibles;
-        NS_IF_ADDREF(*_retval);
-        return NS_OK;
-      }
-    }
-  }
-  // no options, not a select or none of the options are selected
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/**
-  * Our value is the value of our ( first ) selected child. SelectElement
-  *     returns this by default with GetValue().
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccValue(nsAWritableString& _retval)
-{
-  nsCOMPtr<nsIDOMHTMLSelectElement> select (do_QueryInterface(mDOMNode));
-  if ( select ) {
-    select->GetValue(_retval);  
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-/**
-  * As a nsHTMLListboxAccessible we can have the following states:
-  *     STATE_FOCUSED
-  *     STATE_READONLY
-  *     STATE_FOCUSABLE
-  */
-NS_IMETHODIMP nsHTMLListboxAccessible::GetAccState(PRUint32 *_retval)
-{
-  // this sets either STATE_FOCUSED or 0
-  nsAccessible::GetAccState(_retval);
-
-  *_retval |= STATE_READONLY | STATE_FOCUSABLE;
-
-  return NS_OK;
-}
-
-
-

mozilla/accessible/src/nsHTMLListboxAccessible.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: John Gaunt (jgaunt@netscape.com)
- *
- * Contributor(s):
- */
-#ifndef __nsHTMLListboxAccessible_h__
-#define __nsHTMLListboxAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsIAccessibleSelectable.h"
-
-#include "nsCOMPtr.h"
-#include "nsHTMLSelectListAccessible.h"
-
-/*
- * A class the represents the HTML Combobox widget.
- */
-class nsHTMLListboxAccessible : public nsAccessible,
-                                public nsIAccessibleSelectable  
-{
-public:
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLESELECTABLE
-  
-  nsHTMLListboxAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLListboxAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-};
-
-#endif

mozilla/accessible/src/nsHTMLSelectAccessible.cpp

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

mozilla/accessible/src/nsHTMLSelectAccessible.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsHTMLSelectAccessible_h__
-#define __nsHTMLSelectAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-#include "nsIAccessibleSelectable.h"
-
-class nsHTMLSelectAccessible : public nsAccessible,
-                               public nsIAccessibleSelectable  
-{
-public:
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIACCESSIBLESELECTABLE
-  
-  nsHTMLSelectAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLSelectAccessible() {}
-
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccValue(nsAWritableString& _retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-// helper method to verify frames
-  static PRBool IsCorrectFrame( nsIFrame* aFrame, nsIAtom* aAtom );
-
-};
-
-/*
- * Each option in the Select. These are in the nsListAccessible
- */
-class nsHTMLSelectOptionAccessible : public nsLeafAccessible
-{
-public:
-  
-  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval);
-
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-#endif

mozilla/accessible/src/nsHTMLSelectListAccessible.cpp

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

mozilla/accessible/src/nsHTMLSelectListAccessible.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsHTMLSelectListAccessible_h__
-#define __nsHTMLSelectListAccessible_h__
-
-#include "nsAccessible.h"
-
-#include "nsCOMPtr.h"
-
-/*
- * The list that contains all the options in the select.
- */
-class nsHTMLSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsHTMLSelectListAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-  virtual ~nsHTMLSelectListAccessible() {}
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-/*
- * Options inside the select, contained within the list
- */
-class nsHTMLSelectOptionAccessible : public nsLeafAccessible
-{
-public:
-  
-  nsHTMLSelectOptionAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
-
-  /* ----- nsIAccessible ----- */
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  static nsresult GetFocusedOptionNode(nsIWeakReference *aPresShell, nsIDOMNode *aListNode, nsCOMPtr<nsIDOMNode>& aFocusedOptionNode);
-
-protected:
-  
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-#endif

mozilla/accessible/src/nsHTMLTableAccessible.cpp

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTableAccessible.h"
-#include "nsWeakReference.h"
-#include "nsReadableUtils.h"
-
-nsHTMLTableCellAccessible::nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsHTMLBlockAccessible(aDomNode, aShell)
-{ 
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTableCellAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_CELL;
-  return NS_OK;
-}
-
-nsHTMLTableAccessible::nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsHTMLBlockAccessible(aDomNode, aShell)
-{ 
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTableAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_TABLE;
-  return NS_OK;
-}
-

mozilla/accessible/src/nsHTMLTableAccessible.h

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Aaron Leventhal (aaronl@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLTableAccessible_H_
-#define _nsHTMLTableAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsHTMLTableCellAccessible : public nsHTMLBlockAccessible
-{
-public:
-  nsHTMLTableCellAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-
-class nsHTMLTableAccessible : public nsHTMLBlockAccessible
-{
-public:
-  nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-};
-
-#endif  

mozilla/accessible/src/nsHTMLTextAccessible.cpp

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTextAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsString.h"
-#include "nsILink.h"
-#include "nsILinkHandler.h"
-#include "nsISelection.h"
-#include "nsISelectionController.h"
-#include "nsIPresContext.h"
-#include "nsReadableUtils.h"
-
-nsHTMLTextAccessible::nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
-nsLinkableAccessible(aDomNode, aShell)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval)
-{ 
-
-  return mDOMNode->GetNodeValue(_retval);
-}
-
-/* unsigned long getAccRole (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUint32 *_retval)
-{
-  *_retval = ROLE_TEXT;
-
-  return NS_OK;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}

mozilla/accessible/src/nsHTMLTextAccessible.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLTextAccessible_H_
-#define _nsHTMLTextAccessible_H_
-
-#include "nsAccessible.h"
-
-class nsIWeakReference;
-class nsITextControlFrame;
-
-class nsHTMLTextAccessible : public nsLinkableAccessible
-{
-
-public:
-  nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccName(nsAWritableString& _retval); 
-  NS_IMETHOD GetAccRole(PRUint32 *_retval); 
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/nsRootAccessible.cpp

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

mozilla/accessible/src/nsRootAccessible.h

@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsRootAccessible_H_
-#define _nsRootAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIAccessibleEventReceiver.h"
-#include "nsIAccessibleEventListener.h"
-#include "nsIAccessibleDocument.h"
-#include "nsIDOMFormListener.h"
-#include "nsIDOMFocusListener.h"
-#include "nsIDocument.h"
-#include "nsIAccessibilityService.h"
-
-class nsDocAccessibleMixin
-{
-  public:
-    nsDocAccessibleMixin(nsIDocument *doc);
-    nsDocAccessibleMixin(nsIWeakReference *aShell);
-    virtual ~nsDocAccessibleMixin();
-
-    NS_DECL_NSIACCESSIBLEDOCUMENT
-
-    NS_IMETHOD GetAccState(PRUint32 *aAccState);
-
-  protected:
-    nsCOMPtr<nsIDocument> mDocument;
-};
-
-class nsRootAccessible : public nsAccessible,
-                         public nsDocAccessibleMixin,
-                         public nsIAccessibleDocument,
-                         public nsIAccessibleEventReceiver,
-                         public nsIDOMFocusListener,
-                         public nsIDOMFormListener
-
-{
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsRootAccessible(nsIWeakReference* aShell);
-    virtual ~nsRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(nsAWritableString& aAccName);
-    NS_IMETHOD GetAccValue(nsAWritableString& aAccValue);
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-    NS_IMETHOD GetAccRole(PRUint32 *aAccRole);
-    NS_IMETHOD GetAccState(PRUint32 *aAccState);
-
-    // ----- nsIAccessibleEventReceiver -------------------
-
-    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
-
-    // ----- nsIDOMEventListener --------------------------
-    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
-
-    // ----- nsIDOMFocusListener --------------------------
-    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
-    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
-
-    // ----- nsIDOMFormListener ---------------------------
-    NS_IMETHOD Submit(nsIDOMEvent* aEvent);
-    NS_IMETHOD Reset(nsIDOMEvent* aEvent);
-    NS_IMETHOD Change(nsIDOMEvent* aEvent);
-    NS_IMETHOD Select(nsIDOMEvent* aEvent);
-    NS_IMETHOD Input(nsIDOMEvent* aEvent);
-
-    NS_DECL_NSIACCESSIBLEDOCUMENT
-
-  protected:
-    NS_IMETHOD GetTargetNode(nsIDOMEvent *aEvent, nsCOMPtr<nsIDOMNode>& aTargetNode);
-    virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame);
-    virtual nsIFrame* GetFrame();
-
-    // not a com pointer. We don't own the listener
-    // it is the callers responsibility to remove the listener
-    // otherwise we will get into circular referencing problems
-    nsIAccessibleEventListener* mListener;
-    nsCOMPtr<nsIDOMNode> mCurrentFocus;
-    nsCOMPtr<nsIAccessibilityService> mAccService;
-};
-
-
-#endif  

mozilla/aclocal.m4

@@ -1,14 +0,0 @@
-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
-

mozilla/build/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is Mozilla 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 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
-DIRS		= unix
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-# Install bloaturls.txt file for tinderbox Bloaty test.
-install:: $(srcdir)/bloaturls.txt
-	$(INSTALL) $< $(DIST)/bin
-
-# Install startup.html, startup test page.
-install:: $(srcdir)/startup-test.html
-	$(INSTALL) $< $(DIST)/bin

mozilla/build/autoconf/acoutput-fast.pl

@@ -1,179 +0,0 @@
-#! /usr/bin/env perl
-#
-# 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) 1999 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-# acoutput-fast.pl - Quickly create makefiles that are in a common format.
-#
-# Most of the makefiles in mozilla only refer to two configure variables:
-#     @srcdir@
-#     @top_srcdir@
-# However, configure does not know any better and it runs sed on each file
-# with over 150 replacement rules (slow as molasses).
-#
-# This script takes a list of makefiles as input. For example,
-#   
-#     echo $MAKEFILES | acoutput-fast.pl
-#
-# The script creates each Makefile that only references @srcdir@ and
-# @top_srcdir@. For other files, it lists them in a shell command that is
-# printed to stdout:
-#
-#     CONFIG_FILES="unhandled_files..."; export CONFIG_FILES
-#
-# This command can be used to have config.status create the unhandled
-# files. For example,
-#
-#     eval "echo $MAKEFILES | acoutput-fast.pl"
-#     AC_OUTPUT($MAKEFILES)
-#
-# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
-
-#use File::Basename;
-sub dirname {
-  my $dir = $_[0];
-  return '.' if not $dir =~ m%/%;
-  $dir =~ s%/[^/][^/]*$%%;
-  return $dir;
-}
-
-# Create one directory. Assumes it doesn't already exist.
-# Will create parent(s) if needed.
-sub create_directory {
-  my $dir = $_[0];
-  my $parent = dirname($dir);
-  create_directory($parent) if not -d $parent;
-  mkdir "$dir",0777;
-}
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-sub create_directories {
-  my @makefiles = @_;
-  my @dirs = ();
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    push @dirs, dirname($ac_file);
-  }
-  # Call mkdir with the directories sorted by subdir count (how many /'s)
-  if (@dirs) {
-    my $mkdir_command = "mkdir -p ". join(' ', @dirs);
-    if (system($mkdir_command)  != 0) {
-      print STDERR "Creating dirs all at once failed; trying one at atime\n";
-      foreach $dir (@dirs) {
-        if (not -d $dir) {
-          print STDERR "Creating directory $dir\n";
-          create_directory($dir);
-        }
-      }
-    }
-  }
-}
-
-if ($ARGV[0] =~ /^--srcdir=/) {
-  $ac_given_srcdir = (split /=/, shift @ARGV)[1];
-} else {
-  $ac_given_srcdir = $0;
-  $ac_given_srcdir =~ s|/?build/autoconf/.*$||;
-  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
-}
-
-# Read list of makefiles from the stdin or,
-#   from files listed on the command-line.
-#
-@makefiles=();
-push @makefiles, split while (<>);
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-create_directories(@makefiles);
-
-# Output the makefiles.
-#
-@unhandled=();
-foreach $ac_file (@makefiles) {
-  if (not $ac_file =~ /Makefile$/ or $ac_file =~ /:/) {
-    push @unhandled, $ac_file;
-    next;
-  }
-  $ac_file_in = "$ac_given_srcdir/$ac_file.in";
-  $ac_dir = dirname($ac_file);
-  if ($ac_dir eq '.') {
-    $ac_dir_suffix = '';
-    $ac_dots = '';
-  } else {
-    $ac_dir_suffix = "/$ac_dir";
-    $ac_dir_suffix =~ s%^/\./%/%;
-    $ac_dots = $ac_dir_suffix;
-    $ac_dots =~ s%/[^/]*%../%g;
-  }
-  if ($ac_given_srcdir eq '.') {
-    $srcdir = '.';
-    if ($ac_dots eq '') {
-      $top_srcdir = '.'
-    } else {
-      $top_srcdir = $ac_dots;
-      $top_srcdir =~ s%/$%%;
-    }
-  } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
-    $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_given_srcdir";
-  } else {
-    $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_dots$ac_given_srcdir";
-  }
-
-  if (-e $ac_file) {
-    next if -M _ < -M $ac_file_in;
-    print STDERR "updating $ac_file\n";
-  } else {
-    print STDERR "creating $ac_file\n";
-  }
-
-  open (INFILE, "<$ac_file_in")
-    or ( warn "can't read $ac_file_in: No such file or directory\n" and next);
-  open (OUTFILE, ">$ac_file")
-    or ( warn "Unable to create $ac_file\n" and next);
-
-  while (<INFILE>) {
-    #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
-    #  warn "Two defines on a line:$ac_file:$.:$_";
-    #  push @unhandled, $ac_file;
-    #  last;
-    #}
-
-    s/\@srcdir\@/$srcdir/g;
-    s/\@top_srcdir\@/$top_srcdir/g;
-
-    if (/\@[_a-zA-Z]*\@/) {
-      warn "Unknown variable:$ac_file:$.:$_";
-      push @unhandled, $ac_file;
-      last;
-    }
-    print OUTFILE;
-  }
-  close INFILE;
-  close OUTFILE;
-}
-
-# Print the shell command to be evaluated by configure.
-#
-print "CONFIG_FILES=\"".join(' ', @unhandled)."\"; export CONFIG_FILES\n";
-

mozilla/build/autoconf/altoptions.m4

@@ -1,140 +0,0 @@
-dnl The contents of this file are subject to the Netscape Public
-dnl License Version 1.1 (the "License"); you may not use this file
-dnl except in compliance with the License. You may obtain a copy of
-dnl the License at http://www.mozilla.org/NPL/
-dnl
-dnl Software distributed under the License is distributed on an "AS
-dnl IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-dnl implied. See the License for the specific language governing
-dnl rights and limitations under the License.
-dnl
-dnl The Original Code is mozilla.org code.
-dnl
-dnl The Initial Developer of the Original Code is Netscape
-dnl Communications Corporation.  Portions created by Netscape are
-dnl Copyright (C) 1999 Netscape Communications Corporation. All
-dnl Rights Reserved.
-dnl
-dnl Contributor(s): 
-dnl
-
-dnl altoptions.m4 - An alternative way of specifying command-line options.
-dnl    These macros are needed to support a menu-based configurator.
-dnl    This file also includes the macro, AM_READ_MYCONFIG, for reading
-dnl    the 'myconfig.m4' file.
-
-dnl Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
-
-
-dnl MOZ_ARG_ENABLE_BOOL(           NAME, HELP, IF-YES [, IF-NO [, ELSE]])
-dnl MOZ_ARG_DISABLE_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE]])
-dnl MOZ_ARG_ENABLE_STRING(         NAME, HELP, IF-SET [, ELSE])
-dnl MOZ_ARG_ENABLE_BOOL_OR_STRING( NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
-dnl MOZ_ARG_WITH_BOOL(             NAME, HELP, IF-YES [, IF-NO [, ELSE])
-dnl MOZ_ARG_WITHOUT_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE])
-dnl MOZ_ARG_WITH_STRING(           NAME, HELP, IF-SET [, ELSE])
-dnl MOZ_ARG_HEADER(Comment)
-dnl MOZ_CHECK_PTHREADS(            NAME, IF-YES [, ELSE ])
-dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
-
-
-dnl MOZ_TWO_STRING_TEST(NAME, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
-AC_DEFUN(MOZ_TWO_STRING_TEST,
-[if test "$enableval" = "[$2]"; then
-    ifelse([$3], , :, [$3])
-  elif test "$enableval" = "[$4]"; then
-    ifelse([$5], , :, [$5])
-  else
-    ifelse([$6], ,
-      [AC_MSG_ERROR([Option, [$1], does not take an argument ($enableval).])],
-      [$6])
-  fi])
-
-dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
-AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
-[AC_ARG_ENABLE([$1], [$2], 
- [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
- [$5])])
-
-dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
-AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
-[AC_ARG_ENABLE([$1], [$2],
- [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
- [$5])])
-
-dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
-AC_DEFUN(MOZ_ARG_ENABLE_STRING,
-[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
-
-dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
-AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
-[ifelse([$5], , 
- [errprint([Option, $1, needs an "IF-SET" argument.
-])
-  m4exit(1)],
- [AC_ARG_ENABLE([$1], [$2],
-  [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4], [$5])],
-  [$6])])])
-
-dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
-AC_DEFUN(MOZ_ARG_WITH_BOOL,
-[AC_ARG_WITH([$1], [$2],
- [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
- [$5])])
-
-dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
-AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
-[AC_ARG_WITH([$1], [$2],
- [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
- [$5])])
-
-dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
-AC_DEFUN(MOZ_ARG_WITH_STRING,
-[AC_ARG_WITH([$1], [$2], [$3], [$4])])
-
-dnl MOZ_ARG_HEADER(Comment)
-dnl This is used by webconfig to group options
-define(MOZ_ARG_HEADER, [# $1])
-
-dnl
-dnl Apparently, some systems cannot properly check for the pthread
-dnl library unless <pthread.h> is included so we need to test
-dnl using it
-dnl
-dnl MOZ_CHECK_PTHREADS(lib, success, failure)
-AC_DEFUN(MOZ_CHECK_PTHREADS,
-[
-AC_MSG_CHECKING([for pthread_create in -l$1])
-echo "
-    #include <pthread.h> 
-    void *foo(void *v) { int a = 1;  } 
-    int main() { 
-        pthread_t t;
-        if (!pthread_create(&t, 0, &foo, 0)) {
-            pthread_join(t, 0);
-        }
-        exit(0);
-    }" > dummy.c ;
-    echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS" 1>&5;
-    ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS 2>&5;
-    _res=$? ;
-    rm -f dummy.c dummy${ac_exeext} ;
-    if test "$_res" = "0"; then
-        AC_MSG_RESULT([yes])
-        [$2]
-    else
-        AC_MSG_RESULT([no])
-        [$3]
-    fi
-])
-
-dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
-AC_DEFUN(MOZ_READ_MOZCONFIG,
-[AC_REQUIRE([AC_INIT_BINSH])dnl
-# Read in '.mozconfig' script to set the initial options.
-# See the mozconfig2configure script for more details.
-_AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
-. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
-
-dnl This gets inserted at the top of the configure script
-MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)

mozilla/build/autoconf/clean-config.sh

@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# 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): 
-#
-
-# clean-config.sh - Removes all files generated by mozilla configure.
-#    Only removes files from the topsrcdir. To clean up an objdir,
-#    simply remove the directory and start over.
-#
-# Usage:
-#    1. cd <topsrcdir>
-#    2. build/autoconf/clean-config.sh
-#
-# Send comments, improvements, bugs to slamm@netscape.com
-
-topsrcdir=`cd \`dirname $0\`/../..; pwd`
-
-if [ ! -f configure.in ]; then
-  echo "clean-config.sh only cleans the source tree. To run," 2>&1
-  echo "  cd $topsrcdir; build/autoconf/clean-config.sh" 2>&1
-  echo "  (To clean a separate objdir, simple remove the directory.)" 2>&1
-  exit 1
-fi
-
-if [ -f mailnews/makefiles ]; then
-  MOZ_MAIL_NEWS=1
-  export MOZ_MAIL_NEWS
-fi
-
-. allmakefiles.sh
-
-rm -fr $MAKEFILES \
-    config-defs.h \
-    config.cache \
-    config.log \
-    config.status \
-    $NULL

mozilla/build/autoconf/glib.m4

@@ -1,200 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN(AM_PATH_GLIB,
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX  Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX
-                          Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread) 
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  dnl Force a version check to keep upgraded versions from being overridden by the cached value.
-  unset ac_cv_path_GLIB_CONFIG
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])

mozilla/build/autoconf/gtk.m4

@@ -1,191 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-# (copy of gtk.m4 (public domain))
-
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN(AM_PATH_GTK,
-[dnl 
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-            gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX 
-                          Exec prefix where GTK is installed (optional)],
-            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-		    , enable_gtktest=yes)
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  dnl Force a version check to keep upgraded versions from being overridden by the cached value.
-  unset ac_cv_path_GTK_CONFIG
-
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$LIBS $GTK_LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found."
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-       echo "*** GTK+ is available from ftp://ftp.gtk.org/pub/gtk"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])

mozilla/build/autoconf/install-sh

@@ -1,119 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "install:  no destination specified"
-	exit 1
-fi
-
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0

mozilla/build/autoconf/libIDL.m4

@@ -1,198 +0,0 @@
-# Configure paths for LIBIDL
-
-dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
-dnl
-AC_DEFUN(AM_PATH_LIBIDL,
-[dnl 
-dnl Get the cflags and libraries from the libIDL-config script
-dnl
-AC_ARG_WITH(libIDL-prefix,[  --with-libIDL-prefix=PFX
-                          Prefix where libIDL is installed (optional)],
-            libIDL_config_prefix="$withval", libIDL_config_prefix="")
-AC_ARG_WITH(libIDL-exec-prefix,[  --with-libIDL-exec-prefix=PFX
-                          Exec prefix where libIDL is installed (optional)],
-            libIDL_config_exec_prefix="$withval", libIDL_config_exec_prefix="")
-AC_ARG_ENABLE(libIDLtest, [  --disable-libIDLtest    Do not try to compile and run a test libIDL program],
-		    , enable_libIDLtest=yes)
-
-  if test x$libIDL_config_exec_prefix != x ; then
-     libIDL_config_args="$libIDL_config_args --exec-prefix=$libIDL_config_exec_prefix"
-     if test x${LIBIDL_CONFIG+set} != xset ; then
-        LIBIDL_CONFIG=$libIDL_config_exec_prefix/bin/libIDL-config
-     fi
-  fi
-  if test x$libIDL_config_prefix != x ; then
-     libIDL_config_args="$libIDL_config_args --prefix=$libIDL_config_prefix"
-     if test x${LIBIDL_CONFIG+set} != xset ; then
-        LIBIDL_CONFIG=$libIDL_config_prefix/bin/libIDL-config
-     fi
-  fi
-
-  AM_PATH_GLIB(1.2.0)
-
-  dnl Force a version check to keep upgraded versions from being overridden by the cached value.
-  unset ac_cv_path_LIBIDL_CONFIG
-
-  AC_PATH_PROG(LIBIDL_CONFIG, libIDL-config, no)
-  min_libIDL_version=ifelse([$1], ,0.6.0,$1)
-  AC_MSG_CHECKING(for libIDL - version >= $min_libIDL_version)
-  no_libIDL=""
-  if test "$LIBIDL_CONFIG" = "no" ; then
-    no_libIDL=yes
-  else
-    LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
-    LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
-    # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
-    # this after we start requiring libIDL 0.6.8 or anything higher
-    LIBIDL_CFLAGS="$GLIB_CFLAGS $LIBIDL_CFLAGS"
-    LIBIDL_LIBS="$GLIB_LIBS $LIBIDL_LIBS"
-    libIDL_config_major_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    libIDL_config_minor_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    libIDL_config_micro_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_libIDLtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
-      LIBS="$LIBIDL_LIBS $LIBS"
-dnl
-dnl Now check if the installed LIBIDL is sufficiently new.
-dnl
-      rm -f conf.libIDLtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <libIDL/IDL.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  int libIDL_major_version;
-  int libIDL_minor_version;
-  int libIDL_micro_version;
-  char *tmp_version;
-
-  system ("touch conf.libIDLtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup ("$min_libIDL_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_libIDL_version");
-     exit(1);
-  }
-  tmp_version = g_strdup (IDL_get_libver_string ());
-  if (sscanf(tmp_version, "%d.%d.%d",
-	     &libIDL_major_version,
-	     &libIDL_minor_version,
-	     &libIDL_micro_version) != 3) {
-     printf("%s, bad version string\n", tmp_version);
-     exit(1);
-  }
-
-  if ((libIDL_major_version != $libIDL_config_major_version) ||
-      (libIDL_minor_version != $libIDL_config_minor_version) ||
-      (libIDL_micro_version != $libIDL_config_micro_version))
-    {
-      printf("\n*** 'libIDL-config --version' returned %d.%d.%d, but libIDL (%d.%d.%d)\n", 
-             $libIDL_config_major_version, $libIDL_config_minor_version, $libIDL_config_micro_version,
-             libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
-      printf ("*** was found! If libIDL-config was correct, then it is best\n");
-      printf ("*** to remove the old version of LIBIDL. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If libIDL-config was wrong, set the environment variable LIBIDL_CONFIG\n");
-      printf("*** to point to the correct copy of libIDL-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((libIDL_major_version != LIBIDL_MAJOR_VERSION) ||
-	   (libIDL_minor_version != LIBIDL_MINOR_VERSION) ||
-           (libIDL_micro_version != LIBIDL_MICRO_VERSION))
-    {
-      printf("\n*** libIDL header files (version %d.%d.%d) do not match\n",
-	     LIBIDL_MAJOR_VERSION, LIBIDL_MINOR_VERSION, LIBIDL_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
-    }
-  else
-    {
-      if ((libIDL_major_version > major) ||
-        ((libIDL_major_version == major) && (libIDL_minor_version > minor)) ||
-        ((libIDL_major_version == major) && (libIDL_minor_version == minor) && (libIDL_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libIDL (%d.%d.%d) was found.\n",
-               libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
-        printf("*** You need at least libIDL version %d.%d.%d.\n",
-               major, minor, micro);
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the libIDL-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of libIDL, but you can also set the LIBIDL_CONFIG environment to point to the\n");
-        printf("*** correct copy of libIDL-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_libIDL=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_libIDL" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$LIBIDL_CONFIG" = "no" ; then
-       echo "*** The libIDL-config script installed by libIDL could not be found"
-       echo "*** If libIDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the LIBIDL_CONFIG environment variable to the"
-       echo "*** full path to libIDL-config."
-     else
-       if test -f conf.libIDLtest ; then
-        :
-       else
-          echo "*** Could not run libIDL test program, checking why..."
-          CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
-          LIBS="$LIBS $LIBIDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-#include <libIDL/IDL.h>
-],      [ return IDL_get_libver_string ? 1 : 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding libIDL or finding the wrong"
-          echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means libIDL was incorrectly installed"
-          echo "*** or that you have moved libIDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the libIDL-config script: $LIBIDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     LIBIDL_CFLAGS=""
-     LIBIDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBIDL_CFLAGS)
-  AC_SUBST(LIBIDL_LIBS)
-  rm -f conf.libIDLtest
-])

mozilla/build/autoconf/make-makefile

@@ -1,280 +0,0 @@
-#! /usr/bin/env perl
-# 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) 1999 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-# make-makefiles - Quickly create Makefiles for subdirectories.
-#      Also, creates any needed subdirectories.
-#
-# usage: make-makefiles [ -t <topsrcdir> -d <depth> ] [ <subdir> | <subdir>/Makefile ] ...
-
-# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
-
-#$debug = 1;
-
-# Determine various tree path variables
-#
-($topsrcdir, $depth, @makefiles) = parse_arguments(@ARGV);
-
-$object_fullpath = `pwd`;
-chdir $depth;
-$object_root = `pwd`;
-chomp $object_fullpath;
-chomp $object_root;
-
-# $source_subdir is the path from the object root to where
-#    'make-makefile' was called. For example, if make-makefile was
-#    called from "mozilla/gfx/src", then $source_subdir would be
-#    "gfx/src/".
-$source_subdir = "$object_fullpath/";
-my $quoted_object_root = quotemeta($object_root);
-$source_subdir =~ s|^$quoted_object_root/||;
-
-# Prefix makefiles with $source_subdir so that paths
-# will be relative to the top of the object tree.
-#
-for $makefile (@makefiles) {
-  $makefile = "$source_subdir$makefile";
-}
-
-create_directories(@makefiles);
-
-# Find the path to the source directory based on how 'make-makefile'
-#  was invoked. The path is either relative to the object directory
-#  or an absolute path.
-$given_srcdir = find_srcdir($topsrcdir, $depth);
-
-if ($debug) {
-  warn "object_fullpath = $object_fullpath\n";
-  warn "object_root     = $object_root\n";
-  warn "source_subdir   = $source_subdir\n";
-  warn "makefiles       = @makefiles\n";
-  warn "given_srcdir    = $given_srcdir\n";
-}
-
-@unhandled = update_makefiles($given_srcdir, @makefiles);
-
-run_config_status(@unhandled);
-
-# end of Main
-############################################################
-
-sub dirname {
- return $_[0] =~ /(.*)\/.*/ ? "$1" : '.';
-}
-
-# find_depth: Pull the value of DEPTH out of a Makefile (or Makefile.in)
-sub find_depth {
-  my $depth = '';
-  open(MAKEFILE, "<$_[0]") || die "Unable to open $_[0]: $!\n";
-  while (<MAKEFILE>) {
-    next unless /^DEPTH\s*=\s*(\..*)/;
-    $depth = $1;
-    last;
-  }
-  close MAKEFILE;
-  return $depth;
-}
-
-sub parse_arguments {
-  my @args = @_;
-  my $depth = '';
-  my $topsrcdir = '';
-  my @makefiles = ();
-
-  while (1) {
-    if ($args[0] eq '-d') {
-      $depth = $args[1];
-      shift @args; 
-      shift @args; 
-    } elsif ($args[0] eq '-t') {
-      $topsrcdir = $args[1];
-      shift @args; 
-      shift @args; 
-    } else {
-      last;
-    }
-  }
-
-  if ($topsrcdir eq '') {
-    $topsrcdir = $0; # Figure out topsrcdir based on program name.
-    $topsrcdir =~ s|/?build/autoconf/.*$||;
-  }
-  if ($depth eq '') {
-    # Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
-    if (-e "Makefile.in") {
-      $depth = find_depth("Makefile.in");
-    } elsif (-e "Makefile") {
-      $depth = find_depth("Makefile");
-    } elsif (-e "../Makefile") {
-      $depth = "../".find_depth("../Makefile");
-      $depth =~ s/\/\.$//;
-    } else {
-      warn "Unable to determine depth (e.g. ../..) to root of objdir tree.\n";
-      die  "No Makefile(.in) present. Try running with '-d <depth>'\n";
-    }
-  } 
-
-  # Build the list of makefiles to generate
-  #
-  @makefiles = ();
-  my $makefile;
-  foreach $makefile (@args) {
-    $makefile =~ s/\.in$//;
-    $makefile =~ s/\/$//;
-    $makefile =~ /Makefile$/ or $makefile .= "/Makefile";
-    push @makefiles, "$makefile";
-  }
-  @makefiles = "Makefile" unless @args;
-
-  return ($topsrcdir, $depth, @makefiles);
-}
-
-
-# Create all the directories at once.
-#   This can be much faster than calling mkdir() for each one.
-sub create_directories {
-  my @makefiles = @_;
-  my @dirs = ();
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    push @dirs, dirname($ac_file);
-  }
-  # Call mkdir with the directories sorted by subdir count (how many /'s)
-  system "mkdir -p ". join(' ', @dirs) if @dirs;
-}
-
-# Find the top of the source directory
-# (Assuming that the executable is in $top_srcdir/build/autoconf)
-sub find_srcdir {
-  my ($ac_given_srcdir, $depth) = @_;
-
-  if ($debug) {
-    print "ac_given_srcdir = $ac_given_srcdir\n";
-    print "depth           = $depth\n";
-  }
-  if ($ac_given_srcdir =~ /^\./ and $depth ne '.') {
-    my $quoted_depth = quotemeta($depth);
-    $ac_given_srcdir =~ s|^$quoted_depth/?||;
-  }
-  if ($debug) {
-    print "ac_given_srcdir = $ac_given_srcdir\n";
-  }
-  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
-  return $ac_given_srcdir;
-}
-
-# Output the makefiles.
-#
-sub update_makefiles {
-  my ($ac_given_srcdir, @makefiles) = @_;
-  my @unhandled=();
-
-  my $ac_file;
-  foreach $ac_file (@makefiles) {
-    my $ac_file_in    = "$ac_given_srcdir/${ac_file}.in";
-    my $ac_dir        = dirname($ac_file);
-    my $ac_dots       = '';
-    my $ac_dir_suffix = '';
-    my $srcdir        = '.';
-    my $top_srcdir    = '.';
-
-    # Determine $srcdir and $top_srcdir
-    #
-    if ($ac_dir ne '.') {
-      $ac_dir_suffix = "/$ac_dir";
-      $ac_dir_suffix =~ s%^/\./%/%;
-      $ac_dots = $ac_dir_suffix;
-      $ac_dots =~ s%/[^/]*%../%g;
-    }
-    if ($ac_given_srcdir eq '.') {
-      if ($ac_dots ne '') {
-        $top_srcdir = $ac_dots;
-        $top_srcdir =~ s%/$%%;
-      }
-    } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
-      $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
-      $top_srcdir = "$ac_given_srcdir";
-    } else {
-      $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
-      $top_srcdir = "$ac_dots$ac_given_srcdir";
-    }
-
-    if ($debug) {
-      print "ac_dir     = $ac_dir\n";
-      print "ac_file    = $ac_file\n";
-      print "ac_file_in = $ac_file_in\n";
-      print "srcdir     = $srcdir\n";
-      print "top_srcdir = $top_srcdir\n";
-      print "cwd        = " . `pwd` . "\n";
-    }
-
-    # Copy the file and make substitutions.
-    #    @srcdir@     -> value of $srcdir
-    #    @top_srcdir@ -> value of $top_srcdir
-    #
-    if (-e $ac_file) {
-      next if -M _ < -M $ac_file_in;  # Next if Makefile is up-to-date.
-      warn "updating $ac_file\n";
-    } else {
-      warn "creating $ac_file\n";
-    }
-
-    open INFILE, "<$ac_file_in" or do {
-      warn "$0: Cannot read $ac_file_in: No such file or directory\n";
-      next;
-    };
-    open OUTFILE, ">$ac_file" or do {
-      warn "$0: Unable to create $ac_file\n";
-      next;
-    };
-
-    while (<INFILE>) {
-      #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
-      #  #warn "Two defines on a line:$ac_file:$.:$_";
-      #  push @unhandled, $ac_file;
-      #  last;
-      #}
-
-      s/\@srcdir\@/$srcdir/g;
-      s/\@top_srcdir\@/$top_srcdir/g;
-
-      if (/\@[_a-zA-Z]*\@/) {
-        #warn "Unknown variable:$ac_file:$.:$_";
-        push @unhandled, $ac_file;
-        last;
-      }
-      print OUTFILE;
-    }
-    close INFILE;
-    close OUTFILE;
-  }
-  return @unhandled;
-}
-
-sub run_config_status {
-  my @unhandled = @_;
-
-  # Run config.status with any unhandled files.
-  #
-  if (@unhandled) {
-    $ENV{CONFIG_FILES}= join ' ', @unhandled;
-    system "./config.status";
-  }
-}

mozilla/build/autoconf/match-dir.sh

@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-# 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): 
-#
-
-#
-# This script will match a dir with a set of dirs.
-#
-# Usage: match-dir.sh match [dir1 dir2 ... dirn]
-#
-# Send comments, improvements, bugs to ramiro@netscape.com
-# 
-
-if [ -f Makefile ]; then
-	MAKEFILE="Makefile"
-else
-	if [ -f Makefile.in ]; then
-		MAKEFILE="Makefile.in"
-	else
-		echo
-		echo "There ain't no 'Makefile' or 'Makefile.in' over here: $pwd, dude."
-		echo
-		exit 1
-	fi
-fi
-
-# Use DEPTH in the Makefile.in to determine the depth
-depth=`grep -w DEPTH ${MAKEFILE}  | grep "\.\." | awk -F"=" '{ print $2; }'`
-cwd=`pwd`
-
-# Determine the depth count
-n=`echo $depth | tr '/' ' ' | wc -w`
-
-cd $depth
-objdir=`pwd`
-
-path=`echo $cwd | sed "s|^${objdir}/||"`
-
-match=$path
-
-for i in $*
-do
-#	echo "Looking for $match in $i"
-
-	echo $i | grep -q -x $match
-
-	if [ $? -eq 0 ]
-	then
-		echo "1"
-
-		exit 0
-	fi
-
-#	echo "Looking for $i in $match"
-
-	echo $match | grep -q $i
-
-	if [ $? -eq 0 ]
-	then
-		echo "1"
-
-		exit 0
-	fi
-done
-
-echo "0"
-
-exit 0