Backout the bug 754202 backout due to orange.

sailfishos · Jun 10, 2012 · 6d6c4ef · 6d6c4ef
1 parent 64dd923
commit 6d6c4ef
Show file tree

Hide file tree

Showing 848 changed files with 9,649 additions and 15,716 deletions.
diff --git a/accessible/public/nsIAccessible.idl b/accessible/public/nsIAccessible.idl
@@ -23,7 +23,7 @@ interface nsIAccessibleRelation;
  * Mozilla creates the implementations of nsIAccessible on demand.
  * See http://www.mozilla.org/projects/ui/accessibility for more information.
  */
-[scriptable, uuid(45600c50-b06a-11e1-afa6-0800200c9a66)]
+[scriptable, uuid(45ce2c92-4d92-49d2-bff1-855934443261)]
 interface nsIAccessible : nsISupports
 {
   /**
@@ -115,13 +115,21 @@ interface nsIAccessible : nsISupports
    * The modifier may be affected by user and platform preferences.
    * Usually alt+letter, or just the letter alone for menu items. 
    */
-  readonly attribute AString accessKey;
+  readonly attribute AString keyboardShortcut;
 
   /**
    * Provides localized string of global keyboard accelerator for default
    * action, such as Ctrl+O for Open file
    */
-  readonly attribute AString keyboardShortcut;
+  readonly attribute AString defaultKeyBinding;
+
+  /**
+   * Provides array of localized string of global keyboard accelerator for
+   * the given action index supported by accessible.
+   *
+   * @param aActionIndex - index of the given action
+   */
+  nsIDOMDOMStringList getKeyBindings(in PRUint8 aActionIndex);
 
   /**
    * Enumerated accessible role (see the constants defined in nsIAccessibleRole).

diff --git a/accessible/src/atk/HTMLTableAccessibleWrap.h b/accessible/src/atk/HTMLTableAccessibleWrap.h
diff --git a/accessible/src/atk/XULListboxAccessibleWrap.h b/accessible/src/atk/XULListboxAccessibleWrap.h
diff --git a/accessible/src/atk/XULTreeGridAccessibleWrap.h b/accessible/src/atk/XULTreeGridAccessibleWrap.h
diff --git a/accessible/src/atk/nsHTMLTableAccessibleWrap.h b/accessible/src/atk/nsHTMLTableAccessibleWrap.h
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef _NSHTMLTABLEACCESSIBLEWRAP_H
+#define _NSHTMLTABLEACCESSIBLEWRAP_H
+
+#include "nsHTMLTableAccessible.h"
+
+typedef class nsHTMLTableAccessible nsHTMLTableAccessibleWrap;
+typedef class nsHTMLTableCellAccessible nsHTMLTableCellAccessibleWrap;
+typedef class nsHTMLTableHeaderCellAccessible nsHTMLTableHeaderCellAccessibleWrap;
+
+#endif
+
diff --git a/accessible/src/atk/XULMenuAccessibleWrap.h → ...ible/src/atk/nsXULListboxAccessibleWrap.h b/accessible/src/atk/XULMenuAccessibleWrap.h → ...ible/src/atk/nsXULListboxAccessibleWrap.h
@@ -4,17 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_a11y_XULMenuAccessibleWrap_h__
-#define mozilla_a11y_XULMenuAccessibleWrap_h__
+#ifndef __nsXULListboxAccessibleWrap_h__
+#define __nsXULListboxAccessibleWrap_h__
 
-#include "XULMenuAccessible.h"
+#include "nsXULListboxAccessible.h"
 
-namespace mozilla {
-namespace a11y {
-
-typedef class XULMenuitemAccessible XULMenuitemAccessibleWrap;
-
-} // namespace a11y
-} // namespace mozilla
+typedef class nsXULListboxAccessible nsXULListboxAccessibleWrap;
+typedef class nsXULListCellAccessible nsXULListCellAccessibleWrap;
 
 #endif
diff --git a/accessible/src/atk/nsXULMenuAccessibleWrap.h b/accessible/src/atk/nsXULMenuAccessibleWrap.h
@@ -0,0 +1,14 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsXULMenuAccessibleWrap_h__
+#define __nsXULMenuAccessibleWrap_h__
+
+#include "nsXULMenuAccessible.h"
+
+typedef class nsXULMenuitemAccessible nsXULMenuitemAccessibleWrap;
+
+#endif
diff --git a/accessible/src/atk/nsXULTreeGridAccessibleWrap.h b/accessible/src/atk/nsXULTreeGridAccessibleWrap.h
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsXULTreeGridAccessibleWrap_h__
+#define __nsXULTreeGridAccessibleWrap_h__
+
+#include "nsXULTreeGridAccessible.h"
+
+typedef class nsXULTreeGridAccessible nsXULTreeGridAccessibleWrap;
+typedef class nsXULTreeGridCellAccessible nsXULTreeGridCellAccessibleWrap;
+
+#endif
+