mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 15:25:52 +00:00
Backed out changeset 871476099df7 (bug 1383299) for xpcshell failures a=backout CLOSED TREE
MozReview-Commit-ID: WuWcXfYz3V
This commit is contained in:
parent
b708734864
commit
76d7cf451f
@ -13,8 +13,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
|
||||
"resource://gre/modules/NetUtil.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "Utils",
|
||||
"resource://gre/modules/sessionstore/Utils.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
|
||||
"resource://gre/modules/PrivateBrowsingUtils.jsm");
|
||||
|
||||
function makeURI(url) {
|
||||
return Services.io.newURI(url);
|
||||
@ -74,29 +72,6 @@ RemoteWebNavigation.prototype = {
|
||||
},
|
||||
loadURIWithOptions(aURI, aLoadFlags, aReferrer, aReferrerPolicy,
|
||||
aPostData, aHeaders, aBaseURI, aTriggeringPrincipal) {
|
||||
// We know the url is going to be loaded, let's start requesting network
|
||||
// connection before the content process asks.
|
||||
// Note that we might have already setup the speculative connection in some
|
||||
// cases, especially when the url is from location bar or its popup menu.
|
||||
if (aURI.startsWith("http")) {
|
||||
let uri = makeURI(aURI);
|
||||
let principal = aTriggeringPrincipal;
|
||||
// We usually have a aTriggeringPrincipal assigned, but in case we don't
|
||||
// have one, create it with OA inferred from the current context.
|
||||
if (!principal) {
|
||||
let attrs = {
|
||||
userContextId: this._browser.getAttribute("usercontextid") || 0,
|
||||
privateBrowsingId: PrivateBrowsingUtils.isBrowserPrivate(this._browser) ? 1 : 0
|
||||
};
|
||||
principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, attrs);
|
||||
}
|
||||
try {
|
||||
Services.io.speculativeConnect2(uri, principal, null);
|
||||
} catch (ex) {
|
||||
// Can't setup speculative connection for this uri string for some
|
||||
// reason, just ignore it.
|
||||
}
|
||||
}
|
||||
this._sendMessage("WebNavigation:LoadURI", {
|
||||
uri: aURI,
|
||||
flags: aLoadFlags,
|
||||
|
Loading…
Reference in New Issue
Block a user