Bug 1165558 - Return valid dispositions even if there wasn't a header. r=bz

This commit is contained in:
Blake Kaplan 2015-10-13 17:00:55 -07:00
parent 41ed092324
commit 12a66da9f6
2 changed files with 7 additions and 2 deletions

View File

@ -1,9 +1,12 @@
[DEFAULT]
skip-if = e10s # Bug 1159385
support-files = file_pdfjs_test.pdf
[browser_pdfjs_main.js]
skip-if = e10s # Bug 1159385
[browser_pdfjs_navigation.js]
skip-if = e10s # Bug 1159385
[browser_pdfjs_savedialog.js]
[browser_pdfjs_views.js]
skip-if = e10s # Bug 1159385
[browser_pdfjs_zoom.js]
skip-if = e10s # Bug 1159385

View File

@ -396,7 +396,9 @@ ExternalHelperAppParent::SetContentCharset(const nsACString& aContentCharset)
NS_IMETHODIMP
ExternalHelperAppParent::GetContentDisposition(uint32_t *aContentDisposition)
{
if (mContentDispositionHeader.IsEmpty())
// NB: mContentDisposition may or may not be set to a non UINT32_MAX value in
// nsExternalHelperAppService::DoContentContentProcessHelper
if (mContentDispositionHeader.IsEmpty() && mContentDisposition == UINT32_MAX)
return NS_ERROR_NOT_AVAILABLE;
*aContentDisposition = mContentDisposition;