mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1087723: Make JS callers of ios.newChannel call ios.newChannel2 in addon-sdk/ (r=erikvold)
This commit is contained in:
parent
b8d4206b47
commit
a4cc7b2651
10
addon-sdk/source/app-extension/bootstrap.js
vendored
10
addon-sdk/source/app-extension/bootstrap.js
vendored
@ -50,7 +50,15 @@ function setResourceSubstitution(domain, uri) {
|
||||
function readURI(uri) {
|
||||
let ioservice = Cc['@mozilla.org/network/io-service;1'].
|
||||
getService(Ci.nsIIOService);
|
||||
let channel = ioservice.newChannel(uri, 'UTF-8', null);
|
||||
|
||||
let channel = ioservice.newChannel2(uri,
|
||||
'UTF-8',
|
||||
null,
|
||||
null, // aLoadingNode
|
||||
systemPrincipal,
|
||||
null, // aTriggeringPrincipal
|
||||
Ci.nsILoadInfo.SEC_NORMAL,
|
||||
Ci.nsIContentPolicy.TYPE_OTHER);
|
||||
let stream = channel.open();
|
||||
|
||||
let cstream = Cc['@mozilla.org/intl/converter-input-stream;1'].
|
||||
|
@ -15,6 +15,7 @@ const IOService = Cc["@mozilla.org/network/io-service;1"].
|
||||
|
||||
const { deprecateFunction } = require('../util/deprecate');
|
||||
const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm");
|
||||
const { Services } = Cu.import("resource://gre/modules/Services.jsm");
|
||||
const FaviconService = Cc["@mozilla.org/browser/favicon-service;1"].
|
||||
getService(Ci.nsIFaviconService);
|
||||
|
||||
@ -51,7 +52,14 @@ exports.getFaviconURIForLocation = getFaviconURIForLocation;
|
||||
* @returns {String}
|
||||
*/
|
||||
function getChromeURIContent(chromeURI) {
|
||||
let channel = IOService.newChannel(chromeURI, null, null);
|
||||
let channel = IOService.newChannel2(chromeURI,
|
||||
null,
|
||||
null,
|
||||
null, // aLoadingNode
|
||||
Services.scriptSecurityManager.getSystemPrincipal(),
|
||||
null, // aTriggeringPrincipal
|
||||
Ci.nsILoadInfo.SEC_NORMAL,
|
||||
Ci.nsIContentPolicy.TYPE_OTHER);
|
||||
let input = channel.open();
|
||||
let stream = Cc["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Ci.nsIBinaryInputStream);
|
||||
|
@ -8,11 +8,13 @@ module.metadata = {
|
||||
"stability": "experimental"
|
||||
};
|
||||
|
||||
const { Cu, components } = require("chrome");
|
||||
const { Ci, Cu, components } = require("chrome");
|
||||
|
||||
const { defer } = require("../core/promise");
|
||||
const { merge } = require("../util/object");
|
||||
|
||||
const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
|
||||
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
|
||||
|
||||
/**
|
||||
* Reads a URI and returns a promise.
|
||||
@ -33,12 +35,19 @@ function readURI(uri, options) {
|
||||
options = options || {};
|
||||
let charset = options.charset || 'UTF-8';
|
||||
|
||||
let channel = NetUtil.newChannel(uri, charset, null);
|
||||
let channel = NetUtil.newChannel2(uri,
|
||||
charset,
|
||||
null,
|
||||
null, // aLoadingNode
|
||||
Services.scriptSecurityManager.getSystemPrincipal(),
|
||||
null, // aTriggeringPrincipal
|
||||
Ci.nsILoadInfo.SEC_NORMAL,
|
||||
Ci.nsIContentPolicy.TYPE_OTHER);
|
||||
|
||||
let { promise, resolve, reject } = defer();
|
||||
|
||||
try {
|
||||
NetUtil.asyncFetch(channel, function (stream, result) {
|
||||
NetUtil.asyncFetch2(channel, function (stream, result) {
|
||||
if (components.isSuccessCode(result)) {
|
||||
let count = stream.available();
|
||||
let data = NetUtil.readInputStreamToString(stream, count, { charset : charset });
|
||||
@ -74,7 +83,14 @@ exports.readURI = readURI;
|
||||
function readURISync(uri, charset) {
|
||||
charset = typeof charset === "string" ? charset : "UTF-8";
|
||||
|
||||
let channel = NetUtil.newChannel(uri, charset, null);
|
||||
let channel = NetUtil.newChannel2(uri,
|
||||
charset,
|
||||
null,
|
||||
null, // aLoadingNode
|
||||
Services.scriptSecurityManager.getSystemPrincipal(),
|
||||
null, // aTriggeringPrincipal
|
||||
Ci.nsILoadInfo.SEC_NORMAL,
|
||||
Ci.nsIContentPolicy.TYPE_OTHER);
|
||||
let stream = channel.open();
|
||||
|
||||
let count = stream.available();
|
||||
|
@ -7,7 +7,7 @@ module.metadata = {
|
||||
"stability": "experimental"
|
||||
};
|
||||
|
||||
const { Cc, Ci, Cr } = require("chrome");
|
||||
const { Cc, Ci, Cr, Cu } = require("chrome");
|
||||
|
||||
const { Class } = require("./core/heritage");
|
||||
const base64 = require("./base64");
|
||||
@ -23,6 +23,8 @@ var resProt = ios.getProtocolHandler("resource")
|
||||
var URLParser = Cc["@mozilla.org/network/url-parser;1?auth=no"]
|
||||
.getService(Ci.nsIURLParser);
|
||||
|
||||
const { Services } = Cu.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
function newURI(uriStr, base) {
|
||||
try {
|
||||
let baseURI = base ? ios.newURI(base, null, null) : null;
|
||||
@ -64,7 +66,12 @@ let toFilename = exports.toFilename = function toFilename(url) {
|
||||
if (uri.scheme == "resource")
|
||||
uri = newURI(resolveResourceURI(uri));
|
||||
if (uri.scheme == "chrome") {
|
||||
var channel = ios.newChannelFromURI(uri);
|
||||
var channel = ios.newChannelFromURI2(uri,
|
||||
null, // aLoadingNode
|
||||
Services.scriptSecurityManager.getSystemPrincipal(),
|
||||
null, // aTriggeringPrincipal
|
||||
Ci.nsILoadInfo.SEC_NORMAL,
|
||||
Ci.nsIContentPolicy.TYPE_OTHER);
|
||||
try {
|
||||
channel = channel.QueryInterface(Ci.nsIFileChannel);
|
||||
return channel.file.path;
|
||||
|
@ -172,7 +172,14 @@ function serializeStack(frames) {
|
||||
exports.serializeStack = serializeStack;
|
||||
|
||||
function readURI(uri) {
|
||||
let stream = NetUtil.newChannel(uri, 'UTF-8', null).open();
|
||||
let stream = NetUtil.newChannel2(uri,
|
||||
'UTF-8',
|
||||
null,
|
||||
null, // aLoadingNode
|
||||
systemPrincipal,
|
||||
null, // aTriggeringPrincipal
|
||||
Ci.nsILoadInfo.SEC_NORMAL,
|
||||
Ci.nsIContentPolicy.TYPE_OTHER).open();
|
||||
let count = stream.available();
|
||||
let data = NetUtil.readInputStreamToString(stream, count, {
|
||||
charset: 'UTF-8'
|
||||
|
Loading…
Reference in New Issue
Block a user