Backed out changeset 9c6f5f334a15 (bug 880042) for mochitest-4 failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 11 Jun 2013 17:23:00 -0400
changeset 141813 a259e4b7d9abbbf2fb2f15ca1c07760997cf3e0d
parent 141812 43fd73efefca072688e0967777ac868680459edf
child 141814 a346d1818e8652ef5210fdc2b9ca86aa9c4ca11f
push id3911
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 20:17:26 +0000
treeherdermozilla-aurora@7e26ca8db92b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs880042
milestone24.0a1
backs out9c6f5f334a15584a1b3749ca55505105d22c6486
Backed out changeset 9c6f5f334a15 (bug 880042) for mochitest-4 failures.
content/html/content/src/HTMLInputElement.cpp
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -319,20 +319,16 @@ HTMLInputElement::nsFilePickerShownCallb
 
   // Collect new selected filenames
   nsCOMArray<nsIDOMFile> newFiles;
   if (mMulti) {
     nsCOMPtr<nsISimpleEnumerator> iter;
     nsresult rv = mFilePicker->GetDomfiles(getter_AddRefs(iter));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    if (!iter) {
-      return NS_OK;
-    }
-
     nsCOMPtr<nsISupports> tmp;
     bool prefSaved = false;
     bool loop = true;
 
     while (NS_SUCCEEDED(iter->HasMoreElements(&loop)) && loop) {
       iter->GetNext(getter_AddRefs(tmp));
       nsCOMPtr<nsIDOMFile> domFile = do_QueryInterface(tmp);
       MOZ_ASSERT(domFile);