From 0a6c8e80417e4e3ce792e8a8980a8812c5ac7586 Mon Sep 17 00:00:00 2001
From: Jignesh Kakadiya <jigneshhk1992@gmail.com>
Date: Wed, 16 May 2012 11:38:49 +0900
Subject: [PATCH] Bug 751493 - Move out combobox list logic from
 nsHTMLSelectListAccessible::NativeRole r=surkov

---
 accessible/src/html/nsHTMLSelectAccessible.cpp | 9 ++++++---
 accessible/src/html/nsHTMLSelectAccessible.h   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp
index 10ebb25c76a..1de97dee37e 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.cpp
+++ b/accessible/src/html/nsHTMLSelectAccessible.cpp
@@ -88,9 +88,6 @@ nsHTMLSelectListAccessible::NativeState()
 role
 nsHTMLSelectListAccessible::NativeRole()
 {
-  if (mParent && mParent->Role() == roles::COMBOBOX)
-    return roles::COMBOBOX_LIST;
-
   return roles::LISTBOX;
 }
 
@@ -710,6 +707,12 @@ nsHTMLComboboxListAccessible::IsPrimaryForNode() const
 ////////////////////////////////////////////////////////////////////////////////
 // nsHTMLComboboxAccessible: nsAccessible
 
+role
+nsHTMLComboboxListAccessible::NativeRole()
+{
+  return roles::COMBOBOX_LIST;
+}
+
 PRUint64
 nsHTMLComboboxListAccessible::NativeState()
 {
diff --git a/accessible/src/html/nsHTMLSelectAccessible.h b/accessible/src/html/nsHTMLSelectAccessible.h
index 1998e3704c3..69b6ebdf42a 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.h
+++ b/accessible/src/html/nsHTMLSelectAccessible.h
@@ -258,6 +258,7 @@ public:
   virtual bool IsPrimaryForNode() const;
 
   // nsAccessible
+  virtual mozilla::a11y::role NativeRole();
   virtual PRUint64 NativeState();
   virtual void GetBoundsRect(nsRect& aBounds, nsIFrame** aBoundingFrame);