Bug 2195: select[n] == select.options[n], new implementation for nonstandard DOM interface

content/html/content/src/nsHTMLSelectElement.cpp

@@ -17,6 +17,7 @@
  * Netscape Communications Corporation.  All Rights Reserved.
  */
 #include "nsIDOMHTMLSelectElement.h"
+#include "nsIDOMNSHTMLSelectElement.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIScriptObjectOwner.h"
 #include "nsIDOMEventReceiver.h"
@@ -46,6 +47,7 @@
 #include "nsIFrame.h"
 
 static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID);
+static NS_DEFINE_IID(kIDOMNSHTMLSelectElementIID, NS_IDOMNSHTMLSELECTELEMENT_IID);
 static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID);
 static NS_DEFINE_IID(kIDOMHTMLFormElementIID, NS_IDOMHTMLFORMELEMENT_IID);
 static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID);
@@ -99,6 +101,7 @@ private:
 };
 
 class nsHTMLSelectElement : public nsIDOMHTMLSelectElement,
+                            public nsIDOMNSHTMLSelectElement,
                             public nsIScriptObjectOwner,
                             public nsIDOMEventReceiver,
                             public nsIHTMLContent,
@@ -145,6 +148,7 @@ public:
   NS_IMETHOD Remove(PRInt32 aIndex);
   NS_IMETHOD Blur();
   NS_IMETHOD Focus();
+  NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn);
 
   // nsIScriptObjectOwner
   NS_IMPL_ISCRIPTOBJECTOWNER_USING_GENERIC(mInner)
@@ -230,6 +234,11 @@ nsHTMLSelectElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     mRefCnt++;
     return NS_OK;
   }
+  else if (aIID.Equals(kIDOMNSHTMLSelectElementIID)) {
+    *aInstancePtr = (void*)(nsIDOMNSHTMLSelectElement*)this;
+    mRefCnt++;
+    return NS_OK;
+  }
   else if (aIID.Equals(kIFormControlIID)) {
     *aInstancePtr = (void*)(nsIFormControl*)this;
     mRefCnt++;
@@ -593,6 +602,20 @@ nsHTMLSelectElement::RemoveFocus(nsIPresContext* aPresContext)
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsHTMLSelectElement::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+  *aReturn=nsnull;
+  nsresult result = NS_OK;
+
+  if (nsnull == mOptions) {
+    Init();
+  }
+
+  result = mOptions->Item(aIndex, aReturn);
+  return result;
+}
+
 NS_IMETHODIMP
 nsHTMLSelectElement::AddOption(nsIContent* aContent)
 {

layout/html/content/src/nsHTMLSelectElement.cpp

@@ -17,6 +17,7 @@
  * Netscape Communications Corporation.  All Rights Reserved.
  */
 #include "nsIDOMHTMLSelectElement.h"
+#include "nsIDOMNSHTMLSelectElement.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIScriptObjectOwner.h"
 #include "nsIDOMEventReceiver.h"
@@ -46,6 +47,7 @@
 #include "nsIFrame.h"
 
 static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID);
+static NS_DEFINE_IID(kIDOMNSHTMLSelectElementIID, NS_IDOMNSHTMLSELECTELEMENT_IID);
 static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID);
 static NS_DEFINE_IID(kIDOMHTMLFormElementIID, NS_IDOMHTMLFORMELEMENT_IID);
 static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID);
@@ -99,6 +101,7 @@ private:
 };
 
 class nsHTMLSelectElement : public nsIDOMHTMLSelectElement,
+                            public nsIDOMNSHTMLSelectElement,
                             public nsIScriptObjectOwner,
                             public nsIDOMEventReceiver,
                             public nsIHTMLContent,
@@ -145,6 +148,7 @@ public:
   NS_IMETHOD Remove(PRInt32 aIndex);
   NS_IMETHOD Blur();
   NS_IMETHOD Focus();
+  NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn);
 
   // nsIScriptObjectOwner
   NS_IMPL_ISCRIPTOBJECTOWNER_USING_GENERIC(mInner)
@@ -230,6 +234,11 @@ nsHTMLSelectElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     mRefCnt++;
     return NS_OK;
   }
+  else if (aIID.Equals(kIDOMNSHTMLSelectElementIID)) {
+    *aInstancePtr = (void*)(nsIDOMNSHTMLSelectElement*)this;
+    mRefCnt++;
+    return NS_OK;
+  }
   else if (aIID.Equals(kIFormControlIID)) {
     *aInstancePtr = (void*)(nsIFormControl*)this;
     mRefCnt++;
@@ -593,6 +602,20 @@ nsHTMLSelectElement::RemoveFocus(nsIPresContext* aPresContext)
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+nsHTMLSelectElement::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+  *aReturn=nsnull;
+  nsresult result = NS_OK;
+
+  if (nsnull == mOptions) {
+    Init();
+  }
+
+  result = mOptions->Item(aIndex, aReturn);
+  return result;
+}
+
 NS_IMETHODIMP
 nsHTMLSelectElement::AddOption(nsIContent* aContent)
 {