Fixing bustage -- missing part of patch
authoraaronleventhal@moonset.net
Wed, 18 Apr 2007 08:56:29 -0700
changeset 622 809726f3b680c5b1ab02e707f19dd0a64ac20e48
parent 621 53a5710aa9cf49a89862bc6d7d020286f2c64cb3
child 623 853fa8ebae316d9fddbc91c24a2ccc79d6a78ebf
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9a4pre
Fixing bustage -- missing part of patch
accessible/src/html/nsHTMLSelectAccessible.h
--- a/accessible/src/html/nsHTMLSelectAccessible.h
+++ b/accessible/src/html/nsHTMLSelectAccessible.h
@@ -97,17 +97,16 @@ protected:
     PRUint32 mIndex;
     PRInt32 mSelCount;
     nsCOMPtr<nsIDOMHTMLOptionsCollection> mOptions;
     nsCOMPtr<nsIDOMHTMLOptionElement> mOption;
     nsCOMPtr<nsIWeakReference> mWeakShell;
     nsHTMLSelectableAccessible *mParentSelect;
 
   public:
-    void Shutdown();
     iterator(nsHTMLSelectableAccessible *aParent, nsIWeakReference *aWeakShell);
 
     void CalcSelectionCount(PRInt32 *aSelectionCount);
     void Select(PRBool aSelect);
     void AddAccessibleIfSelected(nsIAccessibilityService *aAccService, 
                                  nsIMutableArray *aSelectedAccessibles, 
                                  nsPresContext *aContext);
     PRBool GetAccessibleIfSelected(PRInt32 aIndex, nsIAccessibilityService *aAccService, nsPresContext *aContext, nsIAccessible **_retval);
@@ -196,16 +195,18 @@ public:
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
   NS_IMETHOD GetNumActions(PRUint8 *_retval);
 };
 
 /** ------------------------------------------------------ */
 /**  Finally, the Combobox widgets                         */
 /** ------------------------------------------------------ */
 
+class nsHTMLComboboxListAccessible;
+
 /*
  * A class the represents the HTML Combobox widget.
  */
 class nsHTMLComboboxAccessible : public nsAccessibleWrap
 {
 public:
   enum { eAction_Click = 0 };
 
@@ -217,19 +218,23 @@ public:
   NS_IMETHOD GetState(PRUint32 *aState, PRUint32 *aExtraState);
   NS_IMETHOD GetValue(nsAString& _retval);
   NS_IMETHOD GetDescription(nsAString& aDescription);
   NS_IMETHOD DoAction(PRUint8 index);
   NS_IMETHOD GetNumActions(PRUint8 *aNumActions);
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
 
   void CacheChildren();
+  NS_IMETHOD Shutdown();
 
 protected:
   already_AddRefed<nsIAccessible> GetFocusedOptionAccessible();
+
+private:
+  nsRefPtr<nsHTMLComboboxListAccessible> mListAccessible;
 };
 
 #ifdef COMBO_BOX_WITH_THREE_CHILDREN
 /*
  * A class the represents the text field in the Select to the left
  *     of the drop down button
  */
 class nsHTMLComboboxTextFieldAccessible  : public nsHTMLTextFieldAccessible