corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 875812 - Uplift Add-on SDK integration branch to Firefox

Browse Source 
2593d0a01b...007eb037f0
This commit is contained in:
Dave Townsend
2013-05-24 09:29:33 -07:00
parent 608f4e0f48
commit 3f9ee6af33
16 changed files with 405 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
addon-sdk/source/lib/sdk/url.js
View File

@@ -12,6 +12,8 @@ const { Cc, Ci, Cr } = require("chrome");
const { Class } = require("./core/heritage");
const base64 = require("./base64");
var tlds = Cc["@mozilla.org/network/effective-tld-service;1"]
.getService(Ci.nsIEffectiveTLDService);
var ios = Cc['@mozilla.org/network/io-service;1']
.getService(Ci.nsIIOService);
@@ -19,6 +21,9 @@ var ios = Cc['@mozilla.org/network/io-service;1']
var resProt = ios.getProtocolHandler("resource")
.QueryInterface(Ci.nsIResProtocolHandler);
var URLParser = Cc["@mozilla.org/network/url-parser;1?auth=no"]
.getService(Ci.nsIURLParser);
function newURI(uriStr, base) {
try {
let baseURI = base ? ios.newURI(base, null, null) : null;
@@ -92,11 +97,29 @@ function URL(url, base) {
port = uri.port == -1 ? null : uri.port;
} catch (e if e.result == Cr.NS_ERROR_FAILURE) {}
let uriData = [uri.path, uri.path.length, {}, {}, {}, {}, {}, {}];
URLParser.parsePath.apply(URLParser, uriData);
let [{ value: filepathPos }, { value: filepathLen },
{ value: queryPos }, { value: queryLen },
{ value: refPos }, { value: refLen }] = uriData.slice(2);
let hash = uri.ref ? "#" + uri.ref : "";
let pathname = uri.path.substr(filepathPos, filepathLen);
let search = uri.path.substr(queryPos, queryLen);
search = search ? "?" + search : "";
this.__defineGetter__("scheme", function() uri.scheme);
this.__defineGetter__("userPass", function() userPass);
this.__defineGetter__("host", function() host);
this.__defineGetter__("hostname", function() host);
this.__defineGetter__("port", function() port);
this.__defineGetter__("path", function() uri.path);
this.__defineGetter__("pathname", function() pathname);
this.__defineGetter__("hash", function() hash);
this.__defineGetter__("href", function() uri.spec);
this.__defineGetter__("origin", function() uri.prePath);
this.__defineGetter__("protocol", function() uri.scheme + ":");
this.__defineGetter__("search", function() search);
Object.defineProperties(this, {
toString: {
@@ -235,6 +258,17 @@ const DataURL = Class({
exports.DataURL = DataURL;
let getTLD = exports.getTLD = function getTLD (url) {
let uri = newURI(url.toString());
let tld = null;
try {
tld = tlds.getPublicSuffix(uri);
} catch (e if
e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS ||
e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS) {}
return tld;
};
let isValidURI = exports.isValidURI = function (uri) {
try {
newURI(uri);