Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6054 from Snuffleupagus/bug-1167053

Browse Source 
[Firefox] Fix newChannel/asyncFetch fallout from bug 1167053
This commit is contained in:
Yury Delendik 2015-05-27 08:12:11 -05:00
commit 95bd84148a
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/firefox/content/PdfStreamConverter.jsm
View File

@ -183,10 +183,7 @@ function makeContentReadable(obj, window) {
function createNewChannel(uri, node, principal) { function createNewChannel(uri, node, principal) {
//#if !MOZCENTRAL //#if !MOZCENTRAL
if (!NetUtil.newChannel2) { if (NetUtil.newChannel2) {
return NetUtil.newChannel(uri);
}
//#endif
return NetUtil.newChannel2(uri, return NetUtil.newChannel2(uri,
null, null,
null, null,
@ -196,14 +193,28 @@ function createNewChannel(uri, node, principal) {
Ci.nsILoadInfo.SEC_NORMAL, Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER); Ci.nsIContentPolicy.TYPE_OTHER);
} }
// The signature of `NetUtil.newChannel` changed in Firefox 38,
// see https://bugzilla.mozilla.org/show_bug.cgi?id=1125618.
var ffVersion = parseInt(Services.appinfo.platformVersion);
if (ffVersion < 38) {
return NetUtil.newChannel(uri);
}
//#endif
return NetUtil.newChannel({
uri: uri,
loadingNode: node,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER,
});
}
function asyncFetchChannel(channel, callback) { function asyncFetchChannel(channel, callback) {
//#if !MOZCENTRAL //#if !MOZCENTRAL
if (!NetUtil.newChannel2) { if (NetUtil.asyncFetch2) {
return NetUtil.asyncFetch(channel, callback); return NetUtil.asyncFetch2(channel, callback);
} }
//#endif //#endif
return NetUtil.asyncFetch2(channel, callback); return NetUtil.asyncFetch(channel, callback);
} }
// PDF data storage // PDF data storage