Bug 1165558 - Return valid dispositions even if there wasn't a header. r=bz
☠☠ backed out by a6f277178c7b ☠ ☠
authorBlake Kaplan <mrbkap@gmail.com>
Tue, 13 Oct 2015 17:00:55 -0700
changeset 267476 8decc8f8fcb16bfb5e6aa11a4a3ada547f5c81b2
parent 267475 d34a1af95066e1d0bd67ca95581fbf5def74bbee
child 267477 863379c3fe31409b8ccf8cba5898e04deb7e849f
push id66499
push usermrbkap@mozilla.com
push dateWed, 14 Oct 2015 00:01:27 +0000
treeherdermozilla-inbound@9c0a6b934c7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1165558
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1165558 - Return valid dispositions even if there wasn't a header. r=bz
browser/extensions/pdfjs/test/browser.ini
uriloader/exthandler/ExternalHelperAppParent.cpp
--- a/browser/extensions/pdfjs/test/browser.ini
+++ b/browser/extensions/pdfjs/test/browser.ini
@@ -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
--- a/uriloader/exthandler/ExternalHelperAppParent.cpp
+++ b/uriloader/exthandler/ExternalHelperAppParent.cpp
@@ -391,17 +391,19 @@ NS_IMETHODIMP
 ExternalHelperAppParent::SetContentCharset(const nsACString& aContentCharset)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 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;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 ExternalHelperAppParent::SetContentDisposition(uint32_t aContentDisposition)