--- a/Makefile.in
+++ b/Makefile.in
@@ -129,48 +129,78 @@ ifdef MOZ_PROFILE
 	echo splitting symbols out of binaries
 	/bin/find $(DIST) -name "*.dll" -exec splitsym {} \;
 	/bin/find $(DIST) -name "*.exe" -exec splitsym {} \;
 	/bin/find $(DIST) -name "*.EXE" -exec splitsym {} \;
 	mkdir -p $(DIST)/$(BUILDID)
 	/bin/find $(DIST) -name "*.dbg" -exec mv {} $(DIST)/$(BUILDID) \;
 endif # MOZ_PROFILE
 endif # MOZILLA_OFFICIAL
+endif # WINNT
+
+ifeq ($(OS_ARCH),WINNT)
+SYM_FIND_CMD := /bin/find . -path dist -prune -o -name "*.exe" \
+    -o -name "*.dll" -o -name "*.EXE" | sed "s/\.[^\.]*$$/\.pdb/"
+# we want to copy PDB files on Windows
+MAKE_SYM_STORE_ARGS := -c
+DUMP_SYMS_BIN := $(topsrcdir)/toolkit/airbag/tools/win32/dump_syms.exe
+endif
+ifeq ($(OS_ARCH),Darwin)
+# need to pass arch flags for universal builds
+ifdef UNIVERSAL_BINARY
+MAKE_SYM_STORE_ARGS := -a "ppc i386"
+SYM_DIST := $(DIST)/universal
+else
+MAKE_SYM_STORE_ARGS := -a $(OS_TEST)
+SYM_DIST := $(DIST)
+endif
+# |file| is stupid on universal binaries, it produces one line of output
+# for the file, and one line of output for each architecture contained within.
+SYM_FIND_CMD := find -L $(SYM_DIST) -type f -a -perm -100 -o -name "*.dylib" \
+    | xargs file -L | grep "Mach-O" | grep -v "for architecture" | cut -f1 -d':'
+DUMP_SYMS_BIN := $(DIST)/host/bin/dump_syms
+endif
+ifeq ($(OS_ARCH),Linux)
+MAKE_SYM_STORE_ARGS :=
+SYM_FIND_CMD := find -L $(DIST)/bin -type f -a -perm -100 -o -name "*.so" \
+    | xargs file -L | grep "ELF" | cut -f1 -d':'
+DUMP_SYMS_BIN := $(DIST)/host/bin/dump_syms
+endif
+
+ifdef MOZ_SYMBOLS_EXTRA_BUILDID
+EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID)
+endif
 
 buildsymbols:
-ifdef MOZ_DEBUG_SYMBOLS
 ifdef MOZ_AIRBAG
 	echo building symbol store
 	mkdir -p $(DIST)/crashreporter-symbols/$(BUILDID)
-	/bin/find . -path "./dist" -prune -o -name "*.exe"                \
-          -o -name "*.dll" -o -name "*.EXE" | sed "s/\.[^\.]*$$/\.pdb/" | \
-	  xargs $(topsrcdir)/toolkit/airbag/tools/make_symbol_store.pl -c \
-	  $(topsrcdir)/toolkit/airbag/tools/win32/dump_syms.exe           \
+	$(SYM_FIND_CMD) | \
+	  xargs $(topsrcdir)/toolkit/airbag/tools/make_symbol_store.pl    \
+	  $(MAKE_SYM_STORE_ARGS) $(DUMP_SYMS_BIN)                         \
 	  $(DIST)/crashreporter-symbols/$(BUILDID) >                      \
-	  $(DIST)/crashreporter-symbols/$(BUILDID)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)-symbols.txt
+	  $(DIST)/crashreporter-symbols/$(BUILDID)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
 	echo packing symbols
 	mkdir -p $(topsrcdir)/../$(BUILDID)
 	cd $(DIST)/crashreporter-symbols/$(BUILDID) && \
           zip -r9D ../crashreporter-symbols-$(BUILDID).zip .
 	mv $(DIST)/crashreporter-symbols/crashreporter-symbols-$(BUILDID).zip \
           $(topsrcdir)/../$(BUILDID)
-endif # MOZ_DEBUG_SYMBOLS
 endif # MOZ_AIRBAG
 
 uploadsymbols:
-ifdef MOZ_DEBUG_SYMBOLS
 ifdef MOZ_AIRBAG
 	$(topsrcdir)/toolkit/airbag/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/crashreporter-symbols-$(BUILDID).zip
 endif
-endif
 
+ifeq ($(OS_ARCH),WINNT)
 signnss:
 ifdef MOZILLA_OFFICIAL
 	echo signing NSS libs
 	cd $(DIST)/bin; ./shlibsign.exe -v -i softokn3.dll
 	cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
 endif # MOZILLA_OFFICIAL
 
-BUILDID = $(shell cat $(DEPTH)/config/build_number)
 deliver: splitsymbols rebase signnss
 
 endif # WINNT
 
+BUILDID = $(shell cat $(DEPTH)/config/build_number)

--- a/accessible/public/Makefile.in
+++ b/accessible/public/Makefile.in
@@ -50,20 +50,20 @@ MODULE    = accessibility
 XPIDL_MODULE= accessibility
 GRE_MODULE	= 1
 
 XPIDLSRCS = \
       nsIAccessibleTypes.idl \
       nsIAccessibilityService.idl \
       nsIAccessibleRetrieval.idl \
       nsIAccessible.idl \
+      nsIAccessibleRelation.idl \
       nsIAccessibleRole.idl \
       nsIAccessibleStates.idl \
       nsPIAccessible.idl \
-      nsIAccessibleCaret.idl \
       nsIAccessibleDocument.idl \
       nsPIAccessibleDocument.idl \
       nsIAccessibleProvider.idl \
       nsIAccessibleSelectable.idl \
       nsIAccessNode.idl \
       nsPIAccessNode.idl \
       nsIAccessibleEvent.idl \
       nsIAccessibleEditableText.idl \

--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -45,16 +45,17 @@ MODULE    = accessibility
 XPIDL_MODULE = accessibility-msaa
 GRE_MODULE   = 1
 DEFFILE = $(win_srcdir)/AccessibleMarshal.def
 
 include $(DEPTH)/config/autoconf.mk
 
 XPIDLSRCS = \
       nsIAccessibleWin32Object.idl \
+      nsIWinAccessNode.idl \
       $(NULL)
 
 DEFINES		+= -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
 
 FORCE_SHARED_LIB = 1
 

new file mode 100755
--- /dev/null
+++ b/accessible/public/msaa/nsIWinAccessNode.idl
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Alexander Surkov <surkov.alexander@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+%{C++
+#include "Guiddef.h"
+%}
+
+[ref] native MSCOMIIDRef(IID);
+
+[uuid(63efe9c5-2610-4d2f-861b-e4ddfe1b70d9)]
+interface nsIWinAccessNode : nsISupports
+{
+  voidPtr queryNativeInterface([const] in MSCOMIIDRef aIID);
+};
+

--- a/accessible/public/nsIAccessNode.idl
+++ b/accessible/public/nsIAccessNode.idl
@@ -32,35 +32,36 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-	
+
 interface nsIDOMNode;
 interface nsIAccessibleDocument;
+interface nsIDOMCSSPrimitiveValue;
 
 /**
  * An interface used by in-process accessibility clients
  * to get style, window, markup and other information about
  * a DOM node. When accessibility is active in Gecko,
  * every DOM node can have one nsIAccessNode for each
  * pres shell the DOM node is rendered in.
  * The nsIAccessNode implementations are instantiated lazily.
  * The nsIAccessNode tree for a given dom window
  * has a one to one relationship to the DOM tree.
  * If the DOM node for this access node is "accessible",
  * then a QueryInterface to nsIAccessible will succeed.
  *
  * @status UNDER_REVIEW
  */
-[scriptable, uuid(11c0007f-531c-43b7-be63-a3060a13d8d2)]
+[scriptable, uuid(71a3b4e7-e83d-45cf-a20e-9ce292bcf19f)]
 interface nsIAccessNode : nsISupports
 {
   /**
    * The DOM node this nsIAccessNode is associated with.
    */
   readonly attribute nsIDOMNode DOMNode;
 
   /**
@@ -153,9 +154,22 @@ interface nsIAccessNode : nsISupports
    * on the version of CSS being used. Therefore, for bounds information, 
    * it is better to use nsIAccessible::accGetBounds.
    * @param pseudoElt The pseudo element to retrieve style for, or NULL
    *                  for general computed style information for this node.
    * @param propertyName Retrieve the computed style value for this property name,
    *                     for example "border-bottom".
    */
   DOMString getComputedStyleValue(in DOMString pseudoElt, in DOMString propertyName);
+
+  /**
+   * The method is similar to getComputedStyleValue() excepting that this one
+   * returns nsIDOMCSSPrimitiveValue.
+   */
+  nsIDOMCSSPrimitiveValue getComputedStyleCSSValue(in DOMString pseudoElt,
+                                                   in DOMString propertyName);
+
+  /**
+   * The language for the current DOM node, e.g. en, de, etc.
+   */
+  readonly attribute DOMString language;
 };
+

--- a/accessible/public/nsIAccessibilityService.idl
+++ b/accessible/public/nsIAccessibilityService.idl
@@ -40,28 +40,28 @@
 #include "nsIAccessibleRetrieval.idl"
 
 interface nsIAccessibleEventListener;
 interface nsIDocument;
 interface nsIFrame;
 interface nsObjectFrame;
 interface nsIContent;
 
-[scriptable, uuid(e4cdb7c5-d029-4bee-bff5-99455c6e0057)]
+[uuid(e4cdb7c5-d029-4bee-bff5-99455c6e0057)]
 interface nsIAccessibilityService : nsIAccessibleRetrieval
 {
   nsIAccessible createOuterDocAccessible(in nsIDOMNode aNode);
   nsIAccessible createRootAccessible(in nsIPresShell aShell, in nsIDocument aDocument);
 
   nsIAccessible createHTML4ButtonAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLAreaAccessible(in nsIWeakReference aPresShell, in nsIDOMNode aDOMNode, in nsIAccessible aAccParent);
   nsIAccessible createHyperTextAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLBRAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
-  [noscript] nsIAccessible createHTMLAccessibleByMarkup(in nsIFrame aFrame, in nsIWeakReference aWeakShell, in nsIDOMNode aDOMNode, in AString aRole);
+  nsIAccessible createHTMLAccessibleByMarkup(in nsIFrame aFrame, in nsIWeakReference aWeakShell, in nsIDOMNode aDOMNode, in AString aRole);
   nsIAccessible createHTMLLIAccessible(in nsISupports aFrame, in nsISupports aBulletFrame, in AString aBulletText);
   nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLComboboxAccessible(in nsIDOMNode aNode, in nsIWeakReference aPresShell);
   nsIAccessible createHTMLGenericAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLGroupboxAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLHRAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLImageAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLLabelAccessible(in nsISupports aFrame);
@@ -70,39 +70,39 @@ interface nsIAccessibilityService : nsIA
   nsIAccessible createHTMLRadioButtonAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLSelectOptionAccessible(in nsIDOMNode aNode, in nsIAccessible aAccParent, in nsIWeakReference aPresShell);
   nsIAccessible createHTMLTableAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLTableCellAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLTableHeadAccessible(in nsIDOMNode aDOMNode);
   nsIAccessible createHTMLTextAccessible(in nsISupports aFrame);
   nsIAccessible createHTMLTextFieldAccessible(in nsISupports aFrame);
 
-  [noscript] nsIAccessible getAccessible(in nsIDOMNode aNode, in nsIPresShell aPresShell,                          
+  nsIAccessible getAccessible(in nsIDOMNode aNode, in nsIPresShell aPresShell,                          
                               in nsIWeakReference aWeakShell, 
                               inout nsIFrame frameHint, out boolean aIsHidden);
 
   // For gtk+ native window accessible
-  [noscript] nsIAccessible addNativeRootAccessible(in voidPtr aAtkAccessible);
-  [noscript] void removeNativeRootAccessible(in nsIAccessible aRootAccessible);
+  nsIAccessible addNativeRootAccessible(in voidPtr aAtkAccessible);
+  void removeNativeRootAccessible(in nsIAccessible aRootAccessible);
 
   /**
    * Invalidate the accessibility cache associated with aPresShell, for accessibles
    * that were generated for aContainerContent and it's subtree.
    * The container content node for the change is passed in, rather than the
    * changed presentation for the content node itself.
    * @param aPresShell         The presShell where changes occured
    * @param aChangeContent     The affected DOM content
    * @param aEvent             The event from nsIAccessibleEvent that
    *                           caused the change:
    *                           Must be one of:
    *                           EVENT_REORDER (change),
    *                           EVENT_SHOW (make visible or create) or 
    *                           EVENT_HIDE (destroy or hide)
    */
-  [noscript] void invalidateSubtreeFor(in nsIPresShell aPresShell,
+  void invalidateSubtreeFor(in nsIPresShell aPresShell,
                                        in nsIContent aChangedContent,
                                        in PRUint32 aEvent);
 };
 
 
 %{ C++
 
 // for component registration

--- a/accessible/public/nsIAccessible.idl
+++ b/accessible/public/nsIAccessible.idl
@@ -39,30 +39,31 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
 #include "nsIArray.idl"
 
 interface nsIPersistentProperties;
 interface nsIDOMDOMStringList;
+interface nsIAccessibleRelation;
 
 /**
  * A cross-platform interface that supports platform-specific 
  * accessibility APIs like MSAA and ATK. Contains the sum of what's needed
  * to support IAccessible as well as ATK's generic accessibility objects.
  * Can also be used by in-process accessibility clients to get information
  * about objects in the accessible tree. The accessible tree is a subset of 
  * nodes in the DOM tree -- such as documents, focusable elements and text.
  * Mozilla creates the implementations of nsIAccessible on demand.
  * See http://www.mozilla.org/projects/ui/accessibility for more information.
  *
  * @status UNDER_REVIEW
  */
-[scriptable, uuid(b3674866-49a9-4cf2-bfea-c00be2d4a695)]
+[scriptable, uuid(004b6882-2df1-49df-bb5f-0fb81a5b1edf)]
 interface nsIAccessible : nsISupports
 {
   /**
    * Parent node in accessible tree.
    */
   readonly attribute nsIAccessible parent;
 
   /**
@@ -217,24 +218,43 @@ interface nsIAccessible : nsISupports
   nsIAccessible getAccessibleAbove();
 
   /**
    * Accessible node geometrically below this one
    */
   nsIAccessible getAccessibleBelow();
 
   /**
-   * Accessible node related to this one 
+   * Return accessible related to this one by the given relation type (see.
+   * constants defined in nsIAccessibleRelation).
    */
   nsIAccessible getAccessibleRelated(in unsigned long aRelationType);
 
-  void getBounds(out long x, 
-                    out long y, 
-                    out long width, 
-                    out long height);
+  /**
+   * Returns the number of accessible relations for this object.
+   */
+  readonly attribute unsigned long relationsCount;
+
+  /**
+   * Returns one accessible relation for this object.
+   *
+   * @param index - relation index (0-based)
+   */
+  nsIAccessibleRelation getRelation(in unsigned long index);
+
+  /**
+   * Returns multiple accessible relations for this object.
+   */
+  nsIArray getRelations();
+
+  /**
+   * Return accessible's x and y coordinates relative to the screen and
+   * accessible's width and height.
+   */
+  void getBounds(out long x, out long y, out long width, out long height);
 
   /**
    * Add or remove this accessible to the current selection
    */
   void setSelected(in boolean isSelected);
 
   /**
    * Extend the current selection from its current accessible anchor node
@@ -278,86 +298,10 @@ interface nsIAccessible : nsISupports
    */
   void doAction(in PRUint8 index);   
 
   /**
    * Get a pointer to accessibility interface for this node, which is specific 
    * to the OS/accessibility toolkit we're running on.
    */
   [noscript] void getNativeInterface(out voidPtr aOutAccessible);
-
-  /**
-   * API states we map from opposite states
-   *   VISIBLE -- mapped as the opposite of INVISIBLE
-   *   SHOWING -- mapped as the opposite of OFFSCREEN
-   *
-   * ATK states we don't have in nsIAccessible:
-   *   ARMED -- no clear use case, used briefly when button is activated
-   *   HAS_TOOLTIP -- no known use case
-   *   ICONIFIED -- Mozilla does not have elements which are collapsable into icons
-   *   TRUNCATED -- need use case. Indicates that an object's onscreen content is truncated, e.g. a text value in a spreadsheet cell. No IA2 state.
-   */   
+};
 
-/**
- * Relation Types -- most of these come from ATK's atkrelationtype.h
- * When adding support for relations, make sure to add them to appropriate
- * places in nsAccessibleWrap implementations
- * RELATION_NULL:
- * RELATION_CONTROLLED_BY:    Controlled by one or more target objects.
- * RELATION_CONTROLLER_FOR:   Controller for one or more target objects.
- * RELATION_LABEL_FOR:        Label for one or more target objects.
- * RELATION_LABELLED_BY:      Labelled by one or more target objects.
- * RELATION_MEMBER_OF:        Member of a group of one or more target objects.
- * RELATION_NODE_CHILD_OF:    Cell in a treetable which is displayed because a
- *                            cell in the same col is expanded & identifies it.
- * RELATION_FLOWS_TO:         Has content that flows logically to another
- *                            object in a sequential way, e.g. text flow.
- * RELATION_FLOWS_FROM:       Has content that flows logically from another
- *                            object in a sequential way, e.g. text flow.
- * RELATION_SUBWINDOW_OF:     Subwindow attached to a component but otherwise 
- *                            not connected in the UI hierarchy to that component.
- * RELATION_EMBEDS:           Visually embeds another object's content, i.e.
- *                            this object's content flows around another's content.
- * RELATION_EMBEDDED_BY:      Inverse of RELATION_EMBEDS; this object's content
- *                            is visually embedded in another object.
- * RELATION_POPUP_FOR:        Popup for another object.
- * RELATION_PARENT_WINDOW_OF: Parent window of another object.
- * RELATION_DEFAULT_BUTTON:   Part of a form/dialog with a related default button.
- * RELATION_DESCRIBED_BY:     Described by one or more target objects.
- * RELATION_DESCRIPTION_FOR:  Description for one or more target objects.
- */
-
-  const unsigned long RELATION_NUL = 0x00;               // ATK_RELATION_NUL
-  const unsigned long RELATION_CONTROLLED_BY = 0x01;     // ATK_RELATION_CONTROLLED_BY
-  const unsigned long RELATION_CONTROLLER_FOR = 0x02;    // ATK_RELATION_CONTROLLER_FOR
-  const unsigned long RELATION_LABEL_FOR = 0x03;         // ATK_RELATION_LABEL_FOR
-  const unsigned long RELATION_LABELLED_BY = 0x04;       // ATK_RELATION_LABELLED_BY
-  const unsigned long RELATION_MEMBER_OF = 0x05;         // ATK_RELATION_MEMBER_OF
-  const unsigned long RELATION_NODE_CHILD_OF = 0x06;     // ATK_RELATION_NODE_CHILD_OF
-  const unsigned long RELATION_FLOWS_TO = 0x07;          // ATK_RELATION_FLOWS_TO
-  const unsigned long RELATION_FLOWS_FROM = 0x08;        // ATK_RELATION_FLOWS_FROM
-  const unsigned long RELATION_SUBWINDOW_OF = 0x09;      // ATK_RELATION_SUBWINDOW_OF
-  const unsigned long RELATION_EMBEDS = 0x0a;            // ATK_RELATION_EMBEDS
-  const unsigned long RELATION_EMBEDDED_BY = 0x0b;       // ATK_RELATION_EMBEDDED_BY
-  const unsigned long RELATION_POPUP_FOR = 0x0c;         // ATK_RELATION_POPUP_FOR
-  const unsigned long RELATION_PARENT_WINDOW_OF = 0x0d;  // ATK_RELATION_PARENT_WINDOW_OF
-  const unsigned long RELATION_DESCRIBED_BY = 0x0e;      // ATK_RELATION_DESCRIBED_BY
-  const unsigned long RELATION_DESCRIPTION_FOR = 0x0f;   // ATK_RELATION_DESCRIPTION_FOR
-  const unsigned long RELATION_DEFAULT_BUTTON = 0x4000;  // MSAA only, no ATK relation
-
-// MSAA relationship extensions to accNavigate
-  const unsigned long NAVRELATION_CONTROLLED_BY = 0x1000;
-  const unsigned long NAVRELATION_CONTROLLER_FOR = 0x1001;
-  const unsigned long NAVRELATION_LABEL_FOR = 0x1002;
-  const unsigned long NAVRELATION_LABELLED_BY = 0x1003;
-  const unsigned long NAVRELATION_MEMBER_OF = 0x1004;
-  const unsigned long NAVRELATION_NODE_CHILD_OF = 0x1005;
-  const unsigned long NAVRELATION_FLOWS_TO = 0x1006;
-  const unsigned long NAVRELATION_FLOWS_FROM = 0x1007;
-  const unsigned long NAVRELATION_SUBWINDOW_OF = 0x1008;
-  const unsigned long NAVRELATION_EMBEDS = 0x1009;
-  const unsigned long NAVRELATION_EMBEDDED_BY = 0x100a;
-  const unsigned long NAVRELATION_POPUP_FOR = 0x100b;
-  const unsigned long NAVRELATION_PARENT_WINDOW_OF = 0x100c;
-  const unsigned long NAVRELATION_DEFAULT_BUTTON = 0x100d;
-  const unsigned long NAVRELATION_DESCRIBED_BY = 0x100e;
-  const unsigned long NAVRELATION_DESCRIPTION_FOR = 0x100f;
-};

deleted file mode 100644
--- a/accessible/public/nsIAccessibleCaret.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-#include "nsIDOMNode.idl"
-         
-[scriptable, uuid(9124c666-6133-4be6-b3ed-dd0ec35f1e64)]
-interface nsIAccessibleCaret : nsISupports
-{
-  void attachNewSelectionListener(in nsIDOMNode aFocusedNode);
-  void removeSelectionListener();
-};

--- a/accessible/public/nsIAccessibleDocument.idl
+++ b/accessible/public/nsIAccessibleDocument.idl
@@ -53,17 +53,17 @@ interface nsIDOMWindow;
  * You can QueryInterface to nsIAccessibleDocument from
  * the nsIAccessible or nsIAccessNode for the root node
  * of a document. You can also get one from 
  * nsIAccessNode::GetAccessibleDocument() or 
  * nsIAccessibleEvent::GetAccessibleDocument()
  *
  * @status UNDER_REVIEW
  */
-[scriptable, uuid(DD22939F-B470-4a56-9B80-8C7BA4031334)]
+[scriptable, uuid(ae5792a3-77ad-40d6-8450-d28d19b66889)]
 interface nsIAccessibleDocument : nsISupports
 {
   /**
    * The URL of the document
    */
   readonly attribute AString URL;
 
   /**
@@ -86,21 +86,16 @@ interface nsIAccessibleDocument : nsISup
    */
   readonly attribute nsIDOMDocument document;
 
   /**
    * The nsIDOMWindow that the document resides in.
    */
   readonly attribute nsIDOMWindow window;
 
-  /*
-   * The accessible for the caret belonging to this window.
-   */
-  readonly attribute nsIAccessible caretAccessible;
-
   /**
    * The namespace for each ID that is handed back.
    */
   AString getNameSpaceURIForID(in short nameSpaceID);
 
   /**
    * The window handle for the OS window the document is being displayed in.
    * For example, in Windows you can static cast it to an HWND.
@@ -115,13 +110,15 @@ interface nsIAccessibleDocument : nsISup
    * @return The nsIAccessNode cached for this particular unique ID.
    */
   [noscript] nsIAccessNode getCachedAccessNode(in voidPtr aUniqueID);
 
   /**
    * Returns the first accessible parent of a DOM node.
    * Guaranteed not to return nsnull if the DOM node is in a document.
    * @param aDOMNode The DOM node we need an accessible for.
+   * @param aCanCreate Can accessibles be created or must it be the first 
+   *                   cached accessible in the parent chain?
    * @return An first nsIAccessible found by crawling up the DOM node
    *         to the document root.
    */
-  nsIAccessible getAccessibleInParentChain(in nsIDOMNode aDOMNode);
+  nsIAccessible getAccessibleInParentChain(in nsIDOMNode aDOMNode, in boolean aCanCreate);
 };

--- a/accessible/public/nsIAccessibleProvider.idl
+++ b/accessible/public/nsIAccessibleProvider.idl
@@ -40,17 +40,17 @@
 
 #include "nsISupports.idl"
 
 /**
  * nsIAccessibleProvider interface is used to link element and accessible
    object. For that XBL binding of element should implement the interface.
  */
 
-[scriptable, uuid(18797ea7-44cc-469e-8923-bd5d1c144461)]
+[scriptable, uuid(7250d0f0-732d-4981-b73e-dd5d71b16183)]
 interface nsIAccessibleProvider : nsISupports
 {
   /**
    * Constants set of common use.
    */
 
   /** For elements that spawn a new document. For example now it is used by
     <xul:iframe>, <xul:browser> and <xul:editor>. */
@@ -82,31 +82,28 @@ interface nsIAccessibleProvider : nsISup
   const long XULRadioGroup = 0x00001020;
 
   /** The single tab in a dialog or tabbrowser/editor interface */
   const long XULTab = 0x00001021;
 
   /** A combination of a tabs object and a tabpanels object */
   const long XULTabBox = 0x00001022;
 
-  /** The display area for a dialog or tabbrowser interface */
-  const long XULTabPanels = 0x00001023;
-
   /** The collection of tab objects, useable in the TabBox and independant of
    as well */
-  const long XULTabs = 0x00001024;
+  const long XULTabs = 0x00001023;
 
-  const long XULText = 0x00001025;
-  const long XULTextBox = 0x00001026;
-  const long XULTree = 0x00001027;
-  const long XULTreeColumns = 0x00001028;
-  const long XULTreeColumnitem = 0x00001029;
-  const long XULToolbar = 0x00001030;
-  const long XULToolbarSeparator = 0x00001031;
-  const long XULTooltip = 0x00001032;
+  const long XULText             = 0x00001024;
+  const long XULTextBox          = 0x00001025;
+  const long XULTree             = 0x00001026;
+  const long XULTreeColumns      = 0x00001027;
+  const long XULTreeColumnitem   = 0x00001028;
+  const long XULToolbar          = 0x00001029;
+  const long XULToolbarSeparator = 0x00001030;
+  const long XULTooltip          = 0x00001031;
 
 
   /**
    * Constants set is used by XForms elements.
    */
 
   /** Used for xforms elements that provide accessible object for itself as
    * well for anonymous content. This property are used for upload,

new file mode 100755
--- /dev/null
+++ b/accessible/public/nsIAccessibleRelation.idl
@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Alexander Surkov <surkov.alexander@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+#include "nsIArray.idl"
+
+interface nsIAccessible;
+
+/**
+ * This interface gives access to an accessible's set of relations.
+ * Be carefull, do not change constants until ATK has a structure to map gecko
+ * constants into ATK constants.
+ */
+[scriptable, uuid(f42a1589-70ab-4704-877f-4a9162bbe188)]
+interface nsIAccessibleRelation : nsISupports
+{
+
+  const unsigned long RELATION_NUL = 0x00;
+
+  /**
+   * Some attribute of this object is affected by a target object.
+   */
+  const unsigned long RELATION_CONTROLLED_BY = 0x01;
+
+  /**
+   * This object is interactive and controls some attribute of a target object.
+   */
+  const unsigned long RELATION_CONTROLLER_FOR = 0x02;
+
+  /**
+   * This object is label for a target object.
+   */
+  const unsigned long RELATION_LABEL_FOR = 0x03;
+
+  /**
+   * This object is labelled by a target object.
+   */
+  const unsigned long RELATION_LABELLED_BY = 0x04;
+
+  /**
+   * This object is a member of a group of one or more objects. When there is
+   * more than one object in the group each member may have one and the same
+   * target, e.g. a grouping object.  It is also possible that each member has
+   * multiple additional targets, e.g. one for every other member in the group.
+   */
+  const unsigned long RELATION_MEMBER_OF = 0x05;
+
+  /**
+   * This object is a child of a target object.
+   */
+  const unsigned long RELATION_NODE_CHILD_OF = 0x06;
+
+  /**
+   * Content flows from this object to a target object, i.e. has content that
+   * flows logically to another object in a sequential way, e.g. text flow.
+   */
+  const unsigned long RELATION_FLOWS_TO = 0x07;
+
+  /**
+   * Content flows to this object from a target object, i.e. has content that
+   * flows logically from another object in a sequential way, e.g. text flow.
+   */
+  const unsigned long RELATION_FLOWS_FROM = 0x08;
+
+  /**
+   * This object is a sub window of a target object.
+   */
+  const unsigned long RELATION_SUBWINDOW_OF = 0x09;
+
+  /**
+   * This object embeds a target object. This relation can be used on the
+   * OBJID_CLIENT accessible for a top level window to show where the content
+   * areas are.
+   */
+  const unsigned long RELATION_EMBEDS = 0x0a;
+
+  /**
+   * This object is embedded by a target object.
+   */
+  const unsigned long RELATION_EMBEDDED_BY = 0x0b;
+
+  /**
+   * This object is a transient component related to the target object. When
+   * this object is activated the target object doesn't loose focus.
+   */
+  const unsigned long RELATION_POPUP_FOR = 0x0c;
+
+  /**
+   * This object is a parent window of the target object.
+   */
+  const unsigned long RELATION_PARENT_WINDOW_OF = 0x0d;
+
+  /**
+   * This object is described by the target object.
+   */
+  const unsigned long RELATION_DESCRIBED_BY = 0x0e;
+
+  /**
+   * This object is describes the target object.
+   */
+  const unsigned long RELATION_DESCRIPTION_FOR = 0x0f;
+
+  /**
+   * Part of a form/dialog with a related default button. It is used for
+   * MSAA only, no for IA2 nor ATK.
+   */
+  const unsigned long RELATION_DEFAULT_BUTTON = 0x4000;
+
+  /**
+   * Returns the type of the relation.
+   */
+  readonly attribute unsigned long relationType;
+
+  /**
+   * Returns the number of targets for this relation.
+   */
+  readonly attribute unsigned long targetsCount;
+
+  /**
+   * Returns one accessible relation target.
+   * @param index - 0 based index of relation target.
+   */
+  nsIAccessible getTarget(in unsigned long index);
+
+  /**
+   * Returns multiple accessible relation targets.
+   */
+  nsIArray getTargets();
+};

--- a/accessible/public/nsIAccessibleRetrieval.idl
+++ b/accessible/public/nsIAccessibleRetrieval.idl
@@ -39,16 +39,18 @@
 #include "nsISupports.idl"
 
 interface nsIDOMNode;
 interface nsIAccessible;
 interface nsIWeakReference;
 interface nsIPresShell;
 interface nsIDOMWindow;
 interface nsIAccessNode;
+interface nsIDOMDOMStringList;
+
 
 /**
  * An interface for in-process accessibility clients
  * wishing to get an nsIAccessible or nsIAccessNode for
  * a given DOM node.
  * More documentation at:
  *   http://www.mozilla.org/projects/ui/accessibility
  *
@@ -134,16 +136,31 @@ interface nsIAccessibleRetrieval : nsISu
     * Return an nsIAccessible for an already created DOM node in the given weak shell.
     * Does not create a new one -- only returns cached accessibles.
     * @param aNode      The DOM node to get an accessible for.
     * @param aPresShell The presentation shell which contains layout info for the DOM node.
     * @return The nsIAccessible for the given DOM node or null if
     *         an accessible does not already exist for this DOM node.
     */
   nsIAccessible getCachedAccessible(in nsIDOMNode aNode, in nsIWeakReference aShell);
+  
+   /**
+    * Returns accessible role as a string.
+    *
+    * @param aRole - the accessible role constants.
+    */
+  AString getStringRole(in unsigned long aRole);
+  
+   /**
+    * Returns list which contains accessible states as a strings.
+    *
+    * @param aStates - accessible states.
+    * @param aExtraStates - accessible extra states.
+    */
+  nsIDOMDOMStringList getStringStates(in unsigned long aStates, in unsigned long aExtraStates);
 };
 
 
 %{ C++
 
 // for component registration
 // {663CA4A8-D219-4000-925D-D8F66406B626}
 #define NS_ACCESSIBLE_RETRIEVAL_CID \

--- a/accessible/public/nsIAccessibleTable.idl
+++ b/accessible/public/nsIAccessibleTable.idl
@@ -38,50 +38,153 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
 
 interface nsIAccessible;
 
-[scriptable, uuid(0A7E98A9-CA7D-42F0-BFE1-2CFC35256038)]
+[scriptable, uuid(a776fee4-c0b8-4872-9e1e-72017243383f)]
 interface nsIAccessibleTable : nsISupports
 {
            attribute nsIAccessible       caption;
            attribute AString           summary;
   readonly attribute long                columns;
   readonly attribute nsIAccessibleTable  columnHeader;
   readonly attribute long                rows;
   readonly attribute nsIAccessibleTable  rowHeader;
 
-  void getSelectedColumns (out unsigned long columnsSize,
-          [retval, array, size_is(columnsSize)] out long columns);
-
-  void getSelectedRows (out unsigned long rowsSize,
-          [retval, array, size_is(rowsSize)] out long rows);
-
-    /**
-      * gets a cell
-      */
-  nsIAccessible cellRefAt (in long row, in long column);
+  /**
+   * Returns the accessible object at the specified row and column in the table.
+   * If both row and column index are valid then the corresponding accessible
+   * object is returned that represents the requested cell regardless of whether
+   * the cell is currently visible (on the screen).
+   *
+   * @param row - The row index for which to retrieve the cell.
+   * @param column - The column index for which to retrieve the cell.
+   */
+  nsIAccessible cellRefAt(in long row, in long column);
 
     /**
       * get an index
       */
   long getIndexAt (in long row, in long column);
   long getColumnAtIndex (in long index);
   long getRowAtIndex (in long index);
-  long getColumnExtentAt (in long row, in long column);
-  long getRowExtentAt (in long row, in long column);
+
+  /**
+   * Returns the number of columns occupied by the accessible object
+   * at the specified row and column in the table. The result differs from 1
+   * if the specified cell spans multiple columns.
+   *
+   * @param row - Row index of the accessible for which to return
+   *              the column extent.
+   * @param column - Column index of the accessible for which to return
+   *                 the column extent.
+   */
+  long getColumnExtentAt(in long row, in long column);
+
+  /**
+   * Returns the number of rows occupied by the accessible oject
+   * at the specified row and column in the table. The result differs from 1
+   * if the specified cell spans multiple rows.
+   *
+   * @param row  - Row index of the accessible for which to return
+   *               the column extent.
+   * @param column - Column index of the accessible for which to return
+   *                 the column extent.
+   */
+  long getRowExtentAt(in long row, in long column);
 
-  AString getColumnDescription (in long column);
-  AString getRowDescription (in long row);
+  /**
+   * Returns the description text of the specified column in the table.
+   * @param column - The index of the column for which to retrieve
+   *                 the description.
+   */
+  AString getColumnDescription(in long column);
+
+  /**
+   * Returns the description text of the specified row in the table.
+   * @param row - The index of the row for which to retrieve the description.
+   */
+  AString getRowDescription(in long row);
 
-  boolean isColumnSelected (in long column);
-  boolean isRowSelected (in  long row);
-  boolean isCellSelected (in long row, in long column);
+  /**
+   * Returns a boolean value indicating whether the specified column is
+   * completely selected.
+   *
+   * @param column  - Index of the column for which to determine whether it is
+   *                   selected.
+   */
+  boolean isColumnSelected(in long column);
+
+  /**
+   * Returns a boolean value indicating whether the specified row is completely
+   * selected.
+   *
+   * @param row - Index of the row for which to determine whether it is
+   *              selected.
+   */
+  boolean isRowSelected(in  long row);
 
   /**
-    * Use heuristics to determine if table is most likely used for layout
-    */
+   * Returns a boolean value indicating whether the specified cell is selected.
+   *
+   * @param row - Index of the row for the cell to determine whether it is
+   *              selected.
+   * @param column - Index of the column for the cell to determine whether it
+   *                 is selected.
+   */
+  boolean isCellSelected(in long row, in long column);
+
+  /**
+   * Returns a list of column indexes currently selected.
+   *
+   * @param columnsSize - Length of array
+   * @param columns - Array of indexes of selected columns
+   */
+  void getSelectedColumns(out unsigned long columnsSize,
+                          [retval, array, size_is(columnsSize)] out long columns);
+
+  /**
+   * Returns a list of row indexes currently selected.
+   *
+   * @param rowsSize - Length of array
+   * @param rows - Array of indexes of selected rows
+   */
+  void getSelectedRows(out unsigned long rowsSize,
+                       [retval, array, size_is(rowsSize)] out long rows);
+
+  /**
+   * Selects a row and unselects all previously selected rows.
+   *
+   * @param row - Index of the row to be selected.
+   */
+  void selectRow(in long row);
+
+  /**
+   * Selects a column and unselects all previously selected columns.
+   *
+   * @param column - Index of the column to be selected.
+   */
+  void selectColumn(in long column);
+
+  /**
+   * Unselects one row, leaving other selected rows selected (if any).
+   *
+   * @param row  - Index of the row to be selected.
+  */
+  void unselectRow(in long row);
+
+  /**
+   * Unselects one column, leaving other selected columns selected (if any).
+   *
+   * @param column - Index of the column to be selected.
+   */
+  void unselectColumn(in long column);
+
+  /**
+   * Use heuristics to determine if table is most likely used for layout.
+   */
   boolean isProbablyForLayout();
 };
+

--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -91,16 +91,20 @@ endif
 EXPORTS = \
   nsAccessNodeWrap.h \
   nsAccessibleWrap.h \
   nsDocAccessibleWrap.h \
   nsRootAccessibleWrap.h \
   nsTextAccessibleWrap.h \
   nsXULMenuAccessibleWrap.h \
   nsXULTreeAccessibleWrap.h \
+  nsHyperTextAccessibleWrap.h \
+  nsHTMLImageAccessibleWrap.h \
+  nsHTMLTableAccessibleWrap.h \
+  nsAccessibleRelationWrap.h \
   $(NULL)
 
 # we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
 
 include $(topsrcdir)/config/rules.mk

--- a/accessible/src/atk/nsAccessNodeWrap.cpp
+++ b/accessible/src/atk/nsAccessNodeWrap.cpp
@@ -62,20 +62,17 @@ nsAccessNodeWrap::nsAccessNodeWrap(nsIDO
 //-----------------------------------------------------
 nsAccessNodeWrap::~nsAccessNodeWrap()
 {
 }
 
 void nsAccessNodeWrap::InitAccessibility()
 {
   nsAccessNode::InitXPAccessibility();
-
-  // Init accessibility for ATK
-  nsAppRootAccessible::Load();
 }
 
 void nsAccessNodeWrap::ShutdownAccessibility()
 {
   nsAccessNode::ShutdownXPAccessibility();
 
   // Shutdown accessibility for ATK
-  nsAppRootAccessible::Unload();
+  nsApplicationAccessibleWrap::Unload();
 }

new file mode 100755
--- /dev/null
+++ b/accessible/src/atk/nsAccessibleRelationWrap.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Alexander Surkov <surkov.alexander@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _NS_ACCESSIBLE_RELATION_WRAP_H
+#define _NS_ACCESSIBLE_RELATION_WRAP_H
+
+#include "nsAccessibleRelation.h"
+
+typedef class nsAccessibleRelation nsAccessibleRelationWrap;
+
+#endif
+

--- a/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/accessible/src/atk/nsAccessibleWrap.cpp
@@ -34,20 +34,20 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsMai.h"
 #include "nsAccessibleWrap.h"
-#include "nsAppRootAccessible.h"
+#include "nsAccessibleEventData.h"
 #include "nsString.h"
+#include "nsAutoPtr.h"
 #include "prprf.h"
 #include "nsRoleMap.h"
 #include "nsStateMap.h"
 
 #include "nsMaiInterfaceComponent.h"
 #include "nsMaiInterfaceAction.h"
 #include "nsMaiInterfaceText.h"
 #include "nsMaiInterfaceEditableText.h"
@@ -56,16 +56,18 @@
 #include "nsMaiInterfaceHypertext.h"
 #include "nsMaiInterfaceHyperlinkImpl.h"
 #include "nsMaiInterfaceTable.h"
 #include "nsXPCOMStrings.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMaiInterfaceDocument.h"
 #include "nsMaiInterfaceImage.h"
 
+#include "nsAppRootAccessible.h"
+
 extern "C" GType g_atk_hyperlink_impl_type; //defined in nsAppRootAccessible.cpp
 
 /* MaiAtkObject */
 
 enum {
   ACTIVATE,
   CREATE,
   DEACTIVATE,
@@ -223,16 +225,18 @@ static AtkRelationSet*     refRelationSe
 */
 G_END_DECLS
 
 static GType GetMaiAtkType(PRUint16 interfacesBits);
 static const char * GetUniqueMaiAtkTypeName(PRUint16 interfacesBits);
 
 static gpointer parent_class = NULL;
 
+static GQuark quark_mai_hyperlink = 0;
+
 GType
 mai_atk_object_get_type(void)
 {
     static GType type = 0;
 
     if (!type) {
         static const GTypeInfo tinfo = {
             sizeof(MaiAtkObjectClass),
@@ -244,16 +248,17 @@ mai_atk_object_get_type(void)
             sizeof(MaiAtkObject), /* instance size */
             0, /* nb preallocs */
             (GInstanceInitFunc)NULL,
             NULL /* value table */
         };
 
         type = g_type_register_static(ATK_TYPE_OBJECT,
                                       "MaiAtkObject", &tinfo, GTypeFlags(0));
+        quark_mai_hyperlink = g_quark_from_static_string("MaiHyperlink");
     }
     return type;
 }
 
 /*
  * Must keep sychronization with enumerate AtkProperty in 
  * accessible/src/base/nsAccessibleEventData.h
  */
@@ -295,34 +300,77 @@ nsAccessibleWrap::~nsAccessibleWrap()
 {
 
 #ifdef MAI_LOGGING
     ++mAccWrapDeleted;
 #endif
     MAI_LOG_DEBUG(("==nsAccessibleWrap deleting: this=%p,total=%d left=%d\n",
                    (void*)this, mAccWrapDeleted,
                    (mAccWrapCreated-mAccWrapDeleted)));
+}
 
+NS_IMETHODIMP nsAccessibleWrap::Shutdown()
+{
     if (mAtkObject) {
         if (IS_MAI_OBJECT(mAtkObject)) {
             MAI_ATK_OBJECT(mAtkObject)->accWrap = nsnull;
         }
+        SetMaiHyperlink(nsnull);
         g_object_unref(mAtkObject);
+        mAtkObject = nsnull;
+    }
+    return nsAccessible::Shutdown();
+}
+
+MaiHyperlink* nsAccessibleWrap::GetMaiHyperlink(PRBool aCreate /* = PR_TRUE */)
+{
+    // make sure mAtkObject is created
+    GetAtkObject();
+
+    NS_ASSERTION(quark_mai_hyperlink, "quark_mai_hyperlink not initialized");
+    NS_ASSERTION(IS_MAI_OBJECT(mAtkObject), "Invalid AtkObject");
+    MaiHyperlink* maiHyperlink = nsnull;
+    if (quark_mai_hyperlink && IS_MAI_OBJECT(mAtkObject)) {
+        maiHyperlink = (MaiHyperlink*)g_object_get_qdata(G_OBJECT(mAtkObject),
+                                                         quark_mai_hyperlink);
+        if (!maiHyperlink && aCreate) {
+            maiHyperlink = new MaiHyperlink(this);
+            SetMaiHyperlink(maiHyperlink);
+        }
+    }
+    return maiHyperlink;
+}
+
+void nsAccessibleWrap::SetMaiHyperlink(MaiHyperlink* aMaiHyperlink)
+{
+    NS_ASSERTION(quark_mai_hyperlink, "quark_mai_hyperlink not initialized");
+    NS_ASSERTION(IS_MAI_OBJECT(mAtkObject), "Invalid AtkObject");
+    if (quark_mai_hyperlink && IS_MAI_OBJECT(mAtkObject)) {
+        MaiHyperlink* maiHyperlink = GetMaiHyperlink(PR_FALSE);
+        if (!maiHyperlink && !aMaiHyperlink) {
+            return; // Never set and we're shutting down
+        }
+        if (maiHyperlink) {
+            delete maiHyperlink;
+        }
+        g_object_set_qdata(G_OBJECT(mAtkObject), quark_mai_hyperlink,
+                           aMaiHyperlink);
     }
 }
 
 NS_IMETHODIMP nsAccessibleWrap::GetNativeInterface(void **aOutAccessible)
 {
     *aOutAccessible = nsnull;
 
-    if (!IsEmbeddedObject(this)) {
-      // We don't create ATK objects for nsIAccessible plain text leaves
-      return NS_ERROR_FAILURE;
-    }
     if (!mAtkObject) {
+        if (!IsEmbeddedObject(this)) {
+            // We don't create ATK objects for nsIAccessible plain text leaves
+            return NS_ERROR_FAILURE;
+        }
+
         GType type = GetMaiAtkType(CreateMaiInterfaces());
         NS_ENSURE_TRUE(type, NS_ERROR_FAILURE);
         mAtkObject =
             NS_REINTERPRET_CAST(AtkObject *,
                                 g_object_new(type, NULL));
         NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
 
         atk_object_initialize(mAtkObject, this);
@@ -337,16 +385,26 @@ NS_IMETHODIMP nsAccessibleWrap::GetNativ
 AtkObject *
 nsAccessibleWrap::GetAtkObject(void)
 {
     void *atkObj = nsnull;
     GetNativeInterface(&atkObj);
     return NS_STATIC_CAST(AtkObject *, atkObj);
 }
 
+// Get AtkObject from nsIAccessible interface
+/* static */
+AtkObject *
+nsAccessibleWrap::GetAtkObject(nsIAccessible * acc)
+{
+    void *atkObjPtr = nsnull;
+    acc->GetNativeInterface(&atkObjPtr);
+    return atkObjPtr ? ATK_OBJECT(atkObjPtr) : nsnull;    
+}
+
 /* private */
 PRUint16
 nsAccessibleWrap::CreateMaiInterfaces(void)
 {
     PRUint16 interfacesBits = 0;
     
     // Add Interfaces for each nsIAccessible.ext interfaces
 
@@ -653,76 +711,68 @@ finalizeCB(GObject *aObj)
     // finalize of GObjectClass will unref the accessible parent if has
     if (G_OBJECT_CLASS (parent_class)->finalize)
         G_OBJECT_CLASS (parent_class)->finalize(aObj);
 }
 
 const gchar *
 getNameCB(AtkObject *aAtkObj)
 {
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), nsnull);
-
-    nsAutoString uniName;
-
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return nsnull;
+    }
 
     /* nsIAccessible is responsible for the non-NULL name */
+    nsAutoString uniName;
     nsresult rv = accWrap->GetName(uniName);
     NS_ENSURE_SUCCESS(rv, nsnull);
 
-    if (uniName.Length() > 0) {
-        NS_ConvertUTF8toUTF16 objName(aAtkObj->name);
-        if (!uniName.Equals(objName)) {
-            atk_object_set_name(aAtkObj,
-                                NS_ConvertUTF16toUTF8(uniName).get());
-        }
+    NS_ConvertUTF8toUTF16 objName(aAtkObj->name);
+    if (!uniName.Equals(objName)) {
+        atk_object_set_name(aAtkObj,
+                            NS_ConvertUTF16toUTF8(uniName).get());
     }
     return aAtkObj->name;
 }
 
 const gchar *
 getDescriptionCB(AtkObject *aAtkObj)
 {
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), nsnull);
-
-    if (!aAtkObj->description) {
-        gint len;
-        nsAutoString uniDesc;
-
-        nsAccessibleWrap *accWrap =
-            NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return nsnull;
+    }
 
-        /* nsIAccessible is responsible for the non-NULL description */
-        nsresult rv = accWrap->GetDescription(uniDesc);
-        NS_ENSURE_SUCCESS(rv, nsnull);
-        len = uniDesc.Length();
-        if (len > 0) {
-            atk_object_set_description(aAtkObj,
-                                       NS_ConvertUTF16toUTF8(uniDesc).get());
-        }
+    /* nsIAccessible is responsible for the non-NULL description */
+    nsAutoString uniDesc;
+    nsresult rv = accWrap->GetDescription(uniDesc);
+    NS_ENSURE_SUCCESS(rv, nsnull);
+
+    NS_ConvertUTF8toUTF16 objDesc(aAtkObj->description);
+    if (!uniDesc.Equals(objDesc)) {
+        atk_object_set_description(aAtkObj,
+                                   NS_ConvertUTF16toUTF8(uniDesc).get());
     }
     return aAtkObj->description;
 }
 
 AtkRole
 getRoleCB(AtkObject *aAtkObj)
 {
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), ATK_ROLE_INVALID);
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return ATK_ROLE_INVALID;
+    }
 
 #ifdef DEBUG_A11Y
-        nsAccessibleWrap *testAccWrap =
-            NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
-        NS_ASSERTION(nsAccessible::IsTextInterfaceSupportCorrect(testAccWrap), "Does not support nsIAccessibleText when it should");
+    NS_ASSERTION(nsAccessible::IsTextInterfaceSupportCorrect(accWrap), "Does not support nsIAccessibleText when it should");
 #endif
 
     if (aAtkObj->role == ATK_ROLE_INVALID) {
-        nsAccessibleWrap *accWrap =
-            NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
-
         PRUint32 accRole, atkRole;
         nsresult rv = accWrap->GetFinalRole(&accRole);
         NS_ENSURE_SUCCESS(rv, ATK_ROLE_INVALID);
 
         atkRole = atkRoleMap[accRole]; // map to the actual value
         NS_ASSERTION(atkRoleMap[nsIAccessibleRole::ROLE_LAST_ENTRY] ==
                      kROLE_ATK_LAST_ENTRY, "ATK role map skewed");
         aAtkObj->role = NS_STATIC_CAST(AtkRole, atkRole);
@@ -765,51 +815,48 @@ GetAttributeSet(nsIAccessible* aAccessib
     }
 
     return objAttributeSet;
 }
 
 AtkAttributeSet *
 getAttributesCB(AtkObject *aAtkObj)
 {
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), nsnull);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
-    return GetAttributeSet(accWrap);
+    return accWrap ? GetAttributeSet(accWrap) : nsnull;
 }
 
 AtkObject *
 getParentCB(AtkObject *aAtkObj)
 {
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), nsnull);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    if (!aAtkObj->accessible_parent) {
+        nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+        if (!accWrap) {
+            return nsnull;
+        }
 
-    nsCOMPtr<nsIAccessible> accParent;
-    nsresult rv = accWrap->GetParent(getter_AddRefs(accParent));
-    if (NS_FAILED(rv) || !accParent)
-        return nsnull;
-    nsIAccessible *tmpParent = accParent;
-    nsAccessibleWrap *accWrapParent = NS_STATIC_CAST(nsAccessibleWrap *,
-                                                     tmpParent);
+        nsCOMPtr<nsIAccessible> accParent;
+        nsresult rv = accWrap->GetParent(getter_AddRefs(accParent));
+        if (NS_FAILED(rv) || !accParent)
+            return nsnull;
 
-    AtkObject *parentAtkObj = accWrapParent->GetAtkObject();
-    if (parentAtkObj && !aAtkObj->accessible_parent) {
-        atk_object_set_parent(aAtkObj, parentAtkObj);
+        atk_object_set_parent(aAtkObj,
+                              nsAccessibleWrap::GetAtkObject(accParent));
     }
-    return parentAtkObj;
+    return aAtkObj->accessible_parent;
 }
 
 gint
 getChildCountCB(AtkObject *aAtkObj)
 {
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), 0);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return 0;
+    }
 
     PRInt32 count = 0;
     nsCOMPtr<nsIAccessibleHyperText> hyperText;
     accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), getter_AddRefs(hyperText));
     if (hyperText) {
         // If HyperText, then number of links matches number of children
         hyperText->GetLinks(&count);
     }
@@ -830,19 +877,20 @@ refChildCB(AtkObject *aAtkObj, gint aChi
     if (aChildIndex < 0) {
       return nsnull;
     }
 
     // XXX Fix this so it is not O(n^2) to walk through the children!
     // Either we can cache the last accessed child so that we can just GetNextSibling()
     // or we should cache an array of children in each nsAccessible
     // (instead of mNextSibling on the children)
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), nsnull);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return nsnull;
+    }
 
     nsresult rv;
     nsCOMPtr<nsIAccessible> accChild;
     nsCOMPtr<nsIAccessibleHyperText> hyperText;
     accWrap->QueryInterface(NS_GET_IID(nsIAccessibleHyperText), getter_AddRefs(hyperText));
     if (hyperText) {
         // If HyperText, then number of links matches number of children
         nsCOMPtr<nsIAccessibleHyperLink> hyperLink;
@@ -855,39 +903,37 @@ refChildCB(AtkObject *aAtkObj, gint aChi
         if (!accText) {  // Accessible Text that is not HyperText has no children
             rv = accWrap->GetChildAt(aChildIndex, getter_AddRefs(accChild));
         }
     }
 
     if (NS_FAILED(rv) || !accChild)
         return nsnull;
 
-    nsIAccessible *tmpAccChild = accChild;
-    nsAccessibleWrap *accWrapChild =
-        NS_STATIC_CAST(nsAccessibleWrap*, tmpAccChild);
+    AtkObject* childAtkObj = nsAccessibleWrap::GetAtkObject(accChild);
 
-    //this will addref parent
-    AtkObject *childAtkObj = accWrapChild->GetAtkObject();
     NS_ASSERTION(childAtkObj, "Fail to get AtkObj");
     if (!childAtkObj)
         return nsnull;
-    atk_object_set_parent(childAtkObj,
-                          accWrap->GetAtkObject());
+    
+    //this will addref parent
+    atk_object_set_parent(childAtkObj, aAtkObj);
     g_object_ref(childAtkObj);
     return childAtkObj;
 }
 
 gint
 getIndexInParentCB(AtkObject *aAtkObj)
 {
     // We don't use nsIAccessible::GetIndexInParent() because
     // for ATK we don't want to include text leaf nodes as children
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), -1);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return -1;
+    }
 
     nsCOMPtr<nsIAccessible> parent;
     accWrap->GetParent(getter_AddRefs(parent));
     if (!parent) {
         return -1; // No parent
     }
 
     nsCOMPtr<nsIAccessible> sibling;
@@ -941,19 +987,22 @@ static void TranslateStates(PRUint32 aSt
 }
 
 AtkStateSet *
 refStateSetCB(AtkObject *aAtkObj)
 {
     AtkStateSet *state_set = nsnull;
     state_set = ATK_OBJECT_CLASS(parent_class)->ref_state_set(aAtkObj);
 
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), state_set);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        TranslateStates(nsIAccessibleStates::EXT_STATE_DEFUNCT,
+                        gAtkStateMapExt, state_set);
+        return state_set;
+    }
 
     // Map states
     PRUint32 accState = 0, accExtState = 0;
     nsresult rv = accWrap->GetFinalState(&accState, &accExtState);
     NS_ENSURE_SUCCESS(rv, state_set);
 
     TranslateStates(accState, gAtkStateMap, state_set);
     TranslateStates(accExtState, gAtkStateMapExt, state_set);
@@ -962,100 +1011,106 @@ refStateSetCB(AtkObject *aAtkObj)
 }
 
 AtkRelationSet *
 refRelationSetCB(AtkObject *aAtkObj)
 {
     AtkRelationSet *relation_set = nsnull;
     relation_set = ATK_OBJECT_CLASS(parent_class)->ref_relation_set(aAtkObj);
 
-    NS_ENSURE_SUCCESS(CheckMaiAtkObject(aAtkObj), relation_set);
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
+    if (!accWrap) {
+        return relation_set;
+    }
 
     AtkObject *accessible_array[1];
     AtkRelation* relation;
     
-    PRUint32 relationType[] = {nsIAccessible::RELATION_LABELLED_BY,
-                               nsIAccessible::RELATION_LABEL_FOR,
-                               nsIAccessible::RELATION_NODE_CHILD_OF,
-                               nsIAccessible::RELATION_CONTROLLED_BY,
-                               nsIAccessible::RELATION_CONTROLLER_FOR,
-                               nsIAccessible::RELATION_EMBEDS,
-                               nsIAccessible::RELATION_FLOWS_TO,
-                               nsIAccessible::RELATION_FLOWS_FROM,
-                               nsIAccessible::RELATION_DESCRIBED_BY,
-                               nsIAccessible::RELATION_DESCRIPTION_FOR,
+    PRUint32 relationType[] = {nsIAccessibleRelation::RELATION_LABELLED_BY,
+                               nsIAccessibleRelation::RELATION_LABEL_FOR,
+                               nsIAccessibleRelation::RELATION_NODE_CHILD_OF,
+                               nsIAccessibleRelation::RELATION_CONTROLLED_BY,
+                               nsIAccessibleRelation::RELATION_CONTROLLER_FOR,
+                               nsIAccessibleRelation::RELATION_EMBEDS,
+                               nsIAccessibleRelation::RELATION_FLOWS_TO,
+                               nsIAccessibleRelation::RELATION_FLOWS_FROM,
+                               nsIAccessibleRelation::RELATION_DESCRIBED_BY,
+                               nsIAccessibleRelation::RELATION_DESCRIPTION_FOR,
                                };
 
     for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(relationType); i++) {
         relation = atk_relation_set_get_relation_by_type(relation_set, NS_STATIC_CAST(AtkRelationType, relationType[i]));
         if (relation) {
             atk_relation_set_remove(relation_set, relation);
         }
 
         nsIAccessible* accRelated;
         nsresult rv = accWrap->GetAccessibleRelated(relationType[i], &accRelated);
         if (NS_SUCCEEDED(rv) && accRelated) {
-            accessible_array[0] = NS_STATIC_CAST(nsAccessibleWrap*, accRelated)->GetAtkObject();
+            accessible_array[0] = nsAccessibleWrap::GetAtkObject(accRelated);
             relation = atk_relation_new(accessible_array, 1,
                                         NS_STATIC_CAST(AtkRelationType, relationType[i]));
             atk_relation_set_add(relation_set, relation);
             g_object_unref(relation);
         }
     }
 
     return relation_set;
 }
 
-// Check if aAtkObj is a valid MaiAtkObject
-nsresult
-CheckMaiAtkObject(AtkObject *aAtkObj)
-{
-    NS_ENSURE_ARG(IS_MAI_OBJECT(aAtkObj));
-    nsAccessibleWrap * tmpAccWrap = MAI_ATK_OBJECT(aAtkObj)->accWrap;
-    if (tmpAccWrap == nsnull)
-        return NS_ERROR_INVALID_POINTER;
-    if (tmpAccWrap != nsAppRootAccessible::Create() && !tmpAccWrap->IsValidObject())
-        return NS_ERROR_INVALID_POINTER;
-    if (tmpAccWrap->GetAtkObject() != aAtkObj)
-        return NS_ERROR_FAILURE;
-    return NS_OK;
-}
-
 // Check if aAtkObj is a valid MaiAtkObject, and return the nsAccessibleWrap
 // for it.
 nsAccessibleWrap *GetAccessibleWrap(AtkObject *aAtkObj)
 {
     NS_ENSURE_TRUE(IS_MAI_OBJECT(aAtkObj), nsnull);
-    nsAccessibleWrap * tmpAccWrap = MAI_ATK_OBJECT(aAtkObj)->accWrap;
-    NS_ENSURE_TRUE(tmpAccWrap != nsnull, nsnull);
+    nsAccessibleWrap *tmpAccWrap = MAI_ATK_OBJECT(aAtkObj)->accWrap;
+
+    // Check if AccessibleWrap was deconstructed
+    if (tmpAccWrap == nsnull) {
+        return nsnull;
+    }
+
     NS_ENSURE_TRUE(tmpAccWrap->GetAtkObject() == aAtkObj, nsnull);
+
+    nsRefPtr<nsApplicationAccessibleWrap> appAccWrap =
+        nsAccessNode::GetApplicationAccessible();
+    nsAccessibleWrap* tmpAppAccWrap =
+        NS_STATIC_CAST(nsAccessibleWrap*, appAccWrap.get());
+
+    if (tmpAppAccWrap != tmpAccWrap && !tmpAccWrap->IsValidObject())
+        return nsnull;
+
     return tmpAccWrap;
 }
 
 NS_IMETHODIMP
 nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
 {
     nsresult rv = nsAccessible::FireAccessibleEvent(aEvent);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIAccessible> accessible;
     aEvent->GetAccessible(getter_AddRefs(accessible));
-    nsIAccessible *tmpAccessible = accessible;
-    nsAccessibleWrap *accWrap = NS_STATIC_CAST(nsAccessibleWrap*, tmpAccessible);
-    NS_ENSURE_TRUE(accWrap, NS_ERROR_FAILURE);
-
-    AtkObject *atkObj = accWrap->GetAtkObject();
-    NS_ENSURE_TRUE(atkObj, NS_ERROR_FAILURE);
+    NS_ENSURE_TRUE(accessible, NS_ERROR_FAILURE);
 
     PRUint32 type = 0;
     rv = aEvent->GetEventType(&type);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    AtkObject *atkObj = nsAccessibleWrap::GetAtkObject(accessible);
+
+    // We don't create ATK objects for nsIAccessible plain text leaves,
+    // just return NS_OK in such case
+    if (!atkObj) {
+        NS_ASSERTION(type == nsIAccessibleEvent::EVENT_SHOW ||
+                     type == nsIAccessibleEvent::EVENT_HIDE,
+                     "Event other than SHOW and HIDE fired for plain text leaves");
+        return NS_OK;
+    }
+
     switch (type) {
     case nsIAccessibleEvent::EVENT_STATE_CHANGE:
         return FireAtkStateChangeEvent(aEvent, atkObj);
 
     case nsIAccessibleEvent::EVENT_TEXT_CHANGED:
         return FireAtkTextChangedEvent(aEvent, atkObj);
 
     case nsIAccessibleEvent::EVENT_PROPERTY_CHANGED: