From 904d031bb935d7d515bcdb226aa8351eca6816cd Mon Sep 17 00:00:00 2001
From: "ginn.chen%sun.com"
 <ginn.chen%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 4 Jan 2006 06:09:27 +0000
Subject: [PATCH] Bug 277750 Menu exposes 2-level accessible r=aaronleventhal
 sr=neil.parkwaycc.co.uk

git-svn-id: svn://10.0.0.236/trunk@186895 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/content/widgets/menu.xml        |  3 ---
 mozilla/toolkit/content/widgets/popup.xml       |  5 ++++-
 .../global/resources/content/bindings/popup.xml | 17 ++++-------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/mozilla/toolkit/content/widgets/menu.xml b/mozilla/toolkit/content/widgets/menu.xml
index 77d6b3c3392..247de46561e 100644
--- a/mozilla/toolkit/content/widgets/menu.xml
+++ b/mozilla/toolkit/content/widgets/menu.xml
@@ -21,9 +21,6 @@
             var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
             if (this.localName == "menuseparator")
               return accService.createXULMenuSeparatorAccessible(this);
-            if (this.parentNode && this.parentNode.parentNode &&
-                this.parentNode.localName == "menupopup" && this.parentNode.parentNode.localName == "menulist")
-              return accService.createXULSelectOptionAccessible(this);
             return accService.createXULMenuitemAccessible(this);
           ]]>
         </getter>
diff --git a/mozilla/toolkit/content/widgets/popup.xml b/mozilla/toolkit/content/widgets/popup.xml
index fad70999e21..263dfd0ab88 100644
--- a/mozilla/toolkit/content/widgets/popup.xml
+++ b/mozilla/toolkit/content/widgets/popup.xml
@@ -23,8 +23,11 @@
         <getter>
           <![CDATA[
             var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
+            // Won't create accessible for (menu)popup if parent node is menu
+            // to avoid redundant accessible for menu
             if (this.localName == "popup" || this.localName == "menupopup")
-              return (this.parentNode.localName == "menulist")? accService.createXULSelectListAccessible(this): accService.createXULMenupopupAccessible(this);
+              return (this.parentNode.localName != "menu") ?
+                     accService.createXULMenupopupAccessible(this): null;
             else if (this.localName == "tooltip")
               return accService.createXULTooltipAccessible(this);
             return null;
diff --git a/mozilla/xpfe/global/resources/content/bindings/popup.xml b/mozilla/xpfe/global/resources/content/bindings/popup.xml
index 813e717c357..263dfd0ab88 100644
--- a/mozilla/xpfe/global/resources/content/bindings/popup.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/popup.xml
@@ -23,19 +23,10 @@
         <getter>
           <![CDATA[
             var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            if (this.localName == "popup")
-              return (this.parentNode.localName == "menulist")? accService.createXULSelectListAccessible(this): accService.createXULMenupopupAccessible(this);
-            //
-            // Create accessible for menupopup when parent node is:
-            //   1. menulist: for combobox to visit its menu items
-            //   2. toolbarbutton: for which has menupopup child
-            // Otherwise, won't create accessible for menupopup, e.g.
-            //   1. menu: to avoid redundant accessible for menu
-            //   2. other situations ...
-            //
-            if (this.localName == "menupopup")
-              return ((this.parentNode.localName == "menulist") ||
-                      (this.parentNode.localName == "toolbarbutton")) ?
+            // Won't create accessible for (menu)popup if parent node is menu
+            // to avoid redundant accessible for menu
+            if (this.localName == "popup" || this.localName == "menupopup")
+              return (this.parentNode.localName != "menu") ?
                      accService.createXULMenupopupAccessible(this): null;
             else if (this.localName == "tooltip")
               return accService.createXULTooltipAccessible(this);