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

Using newChannel2 instead of newChannel in the extension.

Browse Source
This commit is contained in:
Yury Delendik 2015-03-09 19:40:19 -05:00
parent c69ad5885c
commit ed243cf02f
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,6 +188,31 @@ function makeContentReadable(obj, window) {
//#endif //#endif
} }
function createNewChannel(uri, node, principal) {
//#if !MOZCENTRAL
if (!NetUtil.newChannel2) {
return NetUtil.newChannel(uri);
}
//#endif
return NetUtil.newChannel2(uri,
null,
null,
node, // aLoadingNode
principal, // aLoadingPrincipal
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
}
function asyncFetchChannel(channel, callback) {
//#if !MOZCENTRAL
if (!NetUtil.newChannel2) {
return NetUtil.asyncFetch(channel, callback);
}
//#endif
return NetUtil.asyncFetch2(channel, callback);
}
// PDF data storage // PDF data storage
function PdfDataListener(length) { function PdfDataListener(length) {
this.length = length; // less than 0, if length is unknown this.length = length; // less than 0, if length is unknown
@ -273,15 +298,16 @@ ChromeActions.prototype = {
download: function(data, sendResponse) { download: function(data, sendResponse) {
var self = this; var self = this;
var originalUrl = data.originalUrl; var originalUrl = data.originalUrl;
var blobUrl = data.blobUrl || originalUrl;
// The data may not be downloaded so we need just retry getting the pdf with // The data may not be downloaded so we need just retry getting the pdf with
// the original url. // the original url.
var originalUri = NetUtil.newURI(data.originalUrl); var originalUri = NetUtil.newURI(originalUrl);
var filename = data.filename; var filename = data.filename;
if (typeof filename !== 'string' || if (typeof filename !== 'string' ||
(!/\.pdf$/i.test(filename) && !data.isAttachment)) { (!/\.pdf$/i.test(filename) && !data.isAttachment)) {
filename = 'document.pdf'; filename = 'document.pdf';
} }
var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; var blobUri = NetUtil.newURI(blobUrl);
var extHelperAppSvc = var extHelperAppSvc =
Cc['@mozilla.org/uriloader/external-helper-app-service;1']. Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
getService(Ci.nsIExternalHelperAppService); getService(Ci.nsIExternalHelperAppService);
@ -289,12 +315,12 @@ ChromeActions.prototype = {
getService(Ci.nsIWindowWatcher).activeWindow; getService(Ci.nsIWindowWatcher).activeWindow;
var docIsPrivate = this.isInPrivateBrowsing(); var docIsPrivate = this.isInPrivateBrowsing();
var netChannel = NetUtil.newChannel(blobUri); var netChannel = createNewChannel(blobUri, frontWindow.document, null);
if ('nsIPrivateBrowsingChannel' in Ci && if ('nsIPrivateBrowsingChannel' in Ci &&
netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel instanceof Ci.nsIPrivateBrowsingChannel) {
netChannel.setPrivate(docIsPrivate); netChannel.setPrivate(docIsPrivate);
} }
NetUtil.asyncFetch(netChannel, function(aInputStream, aResult) { asyncFetchChannel(netChannel, function(aInputStream, aResult) {
if (!Components.isSuccessCode(aResult)) { if (!Components.isSuccessCode(aResult)) {
if (sendResponse) { if (sendResponse) {
sendResponse(true); sendResponse(true);
@ -959,9 +985,8 @@ PdfStreamConverter.prototype = {
.createInstance(Ci.nsIBinaryInputStream); .createInstance(Ci.nsIBinaryInputStream);
// Create a new channel that is viewer loaded as a resource. // Create a new channel that is viewer loaded as a resource.
var ioService = Services.io; var systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();
var channel = ioService.newChannel( var channel = createNewChannel(PDF_VIEWER_WEB_PAGE, null, systemPrincipal);
PDF_VIEWER_WEB_PAGE, null, null);
var listener = this.listener; var listener = this.listener;
var dataListener = this.dataListener; var dataListener = this.dataListener;
@ -1019,7 +1044,7 @@ PdfStreamConverter.prototype = {
// e.g. useful for NoScript // e.g. useful for NoScript
var securityManager = Cc['@mozilla.org/scriptsecuritymanager;1'] var securityManager = Cc['@mozilla.org/scriptsecuritymanager;1']
.getService(Ci.nsIScriptSecurityManager); .getService(Ci.nsIScriptSecurityManager);
var uri = ioService.newURI(PDF_VIEWER_WEB_PAGE, null, null); var uri = NetUtil.newURI(PDF_VIEWER_WEB_PAGE, null, null);
// FF16 and below had getCodebasePrincipal, it was replaced by // FF16 and below had getCodebasePrincipal, it was replaced by
// getNoAppCodebasePrincipal (bug 758258). // getNoAppCodebasePrincipal (bug 758258).
var resourcePrincipal = 'getNoAppCodebasePrincipal' in securityManager ? var resourcePrincipal = 'getNoAppCodebasePrincipal' in securityManager ?