wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset fe00dbf89462 (bug 1063156) for bustage

Browse Source
This commit is contained in:
Wes Kocher 2014-10-30 13:25:35 -07:00
parent cd7a3d69f2
commit 6ee5aea422
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View File

@ -4282,13 +4282,12 @@ this.XPIProvider = {
let principal = Cc["@mozilla.org/systemprincipal;1"]. let principal = Cc["@mozilla.org/systemprincipal;1"].
createInstance(Ci.nsIPrincipal); createInstance(Ci.nsIPrincipal);
#ifdef NIGHTLY_BUILD
if (!aMultiprocessCompatible) { if (!aMultiprocessCompatible && Services.appinfo.browserTabsRemoteAutostart) {
let interposition = Cc["@mozilla.org/addons/multiprocess-shims;1"]. let interposition = Cc["@mozilla.org/addons/multiprocess-shims;1"].
getService(Ci.nsIAddonInterposition); getService(Ci.nsIAddonInterposition);
Cu.setAddonInterposition(aId, interposition); Cu.setAddonInterposition(aId, interposition);
} }
#endif
if (!aFile.exists()) { if (!aFile.exists()) {
this.bootstrapScopes[aId] = this.bootstrapScopes[aId] =

5
toolkit/xre/nsXREDirProvider.cpp
View File

@ -551,7 +551,9 @@ nsXREDirProvider::GetFiles(const char* aProperty, nsISimpleEnumerator** aResult)
static void static void
RegisterExtensionInterpositions(nsINIParser &parser) RegisterExtensionInterpositions(nsINIParser &parser)
{ {
#ifdef NIGHTLY_BUILD if (!mozilla::BrowserTabsRemoteAutostart())
return;
nsCOMPtr<nsIAddonInterposition> interposition = nsCOMPtr<nsIAddonInterposition> interposition =
do_GetService("@mozilla.org/addons/multiprocess-shims;1"); do_GetService("@mozilla.org/addons/multiprocess-shims;1");
@ -570,7 +572,6 @@ RegisterExtensionInterpositions(nsINIParser &parser)
continue; continue;
} }
while (true); while (true);
#endif
} }
static void static void