corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1202964 - Use the correct nsIFilePicker API for directory picking in HTMLInputElement::nsFilePickerShownCallback::Done. r=baku

Browse Source
This commit is contained in:
Jonathan Watt
2015-08-18 10:30:19 +01:00
parent 38fb635313
commit 09a30d92ba
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dom/html/HTMLInputElement.cpp
View File

@@ -378,8 +378,7 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult)
// Collect new selected filenames
nsTArray<nsRefPtr<File>> newFiles;
if (mode == static_cast<int16_t>(nsIFilePicker::modeOpenMultiple) ||
mode == static_cast<int16_t>(nsIFilePicker::modeGetFolder)) {
if (mode == static_cast<int16_t>(nsIFilePicker::modeOpenMultiple)) {
nsCOMPtr<nsISimpleEnumerator> iter;
nsresult rv = mFilePicker->GetDomfiles(getter_AddRefs(iter));
NS_ENSURE_SUCCESS(rv, rv);
@@ -401,7 +400,8 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult)
}
}
} else {
MOZ_ASSERT(mode == static_cast<int16_t>(nsIFilePicker::modeOpen));
MOZ_ASSERT(mode == static_cast<int16_t>(nsIFilePicker::modeOpen) ||
mode == static_cast<int16_t>(nsIFilePicker::modeGetFolder));
nsCOMPtr<nsISupports> tmp;
nsresult rv = mFilePicker->GetDomfile(getter_AddRefs(tmp));
NS_ENSURE_SUCCESS(rv, rv);