Bug 1110495 - Wrap try/catch around e10s add-on shim initialization. r=billm.

--HG--
extra : rebase_source : 43cee1df2bced048dc22be58a7f0a2ccb9dc92a5
This commit is contained in:
Mike Conley 2015-01-13 18:19:18 -05:00
parent d1de9c7e54
commit 3f7b53a553

View File

@ -496,11 +496,21 @@ let RemoteAddonsChild = {
_ready: false,
makeReady: function() {
Prefetcher.init();
NotificationTracker.init();
ContentPolicyChild.init();
AboutProtocolChild.init();
ObserverChild.init();
let shims = [
Prefetcher,
NotificationTracker,
ContentPolicyChild,
AboutProtocolChild,
ObserverChild,
];
for (let shim of shims) {
try {
shim.init();
} catch(e) {
Cu.reportError(e);
}
}
},
init: function(global) {
@ -520,7 +530,11 @@ let RemoteAddonsChild = {
uninit: function(perTabShims) {
for (let shim of perTabShims) {
shim.uninit();
try {
shim.uninit();
} catch(e) {
Cu.reportError(e);
}
}
},
};