From 01539dd21aba6b018e196fea62e3160362c621cf Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 1 Aug 2011 20:28:52 +0900
Subject: [PATCH] Bug 675072 - can not enter text into comment textbox for
 online picasa web picture. r=smaug

---
 content/html/content/src/nsHTMLSelectElement.cpp | 5 +++--
 content/html/content/test/test_bug666200.html    | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index 4bcc6a571032..f560b6a59fb4 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -687,8 +687,9 @@ nsHTMLSelectElement::Add(nsIDOMHTMLElement* aElement,
   nsresult rv = aBefore->GetDataType(&dataType);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // aBefore is omitted or null
-  if (dataType == nsIDataType::VTYPE_EMPTY) {
+  // aBefore is omitted, undefined or null
+  if (dataType == nsIDataType::VTYPE_EMPTY ||
+      dataType == nsIDataType::VTYPE_VOID) {
     return Add(aElement);
   }
 
diff --git a/content/html/content/test/test_bug666200.html b/content/html/content/test/test_bug666200.html
index dbce5aa36aa8..e7d85caaba19 100644
--- a/content/html/content/test/test_bug666200.html
+++ b/content/html/content/test/test_bug666200.html
@@ -22,18 +22,22 @@ var opt1 = new Option();
 var opt2 = new Option();
 var opt3 = new Option();
 var opt4 = new Option();
+var opt5 = new Option();
 opt1.value = 1;
 opt2.value = 2;
 opt3.value = 3;
 opt4.value = 4;
+opt5.value = 5;
 sel.add(opt1);
 sel.add(opt2, 0);
 sel.add(opt3, 1000);
 sel.options.add(opt4, opt3);
+sel.add(opt5, undefined);
 is(sel[0], opt2, "1st item should be 2");
 is(sel[1], opt1, "2nd item should be 1");
 is(sel[2], opt4, "3rd item should be 4");
 is(sel[3], opt3, "4th item should be 3");
+is(sel[4], opt5, "5th item should be 5");
 </script>
 </pre>
 </body>