mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 18:55:30 +00:00
Bug 1511130 - Part I, Backed out changeset faacbb32e16a (Bug 1511130) r=bgrins
My approach in bug 1505957 turned out to be flawed. Differential Revision: https://phabricator.services.mozilla.com/D13607 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
5fda010a9b
commit
9d9da75ab4
@ -79,16 +79,7 @@ class UAWidgetsChild extends ActorChild {
|
|||||||
Services.scriptloader.loadSubScript(uri, sandbox, "UTF-8");
|
Services.scriptloader.loadSubScript(uri, sandbox, "UTF-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
let widget;
|
let widget = new sandbox[widgetName](shadowRoot);
|
||||||
try {
|
|
||||||
widget = new sandbox[widgetName](shadowRoot);
|
|
||||||
} catch (ex) {
|
|
||||||
// The widget may have thrown during construction.
|
|
||||||
// Report the failure and recover by clearing the Shadow DOM.
|
|
||||||
shadowRoot.innerHTML = "";
|
|
||||||
Cu.reportError(ex);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.widgets.set(aElement, widget);
|
this.widgets.set(aElement, widget);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,14 +89,7 @@ class UAWidgetsChild extends ActorChild {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (typeof widget.wrappedJSObject.destructor == "function") {
|
if (typeof widget.wrappedJSObject.destructor == "function") {
|
||||||
try {
|
widget.wrappedJSObject.destructor();
|
||||||
widget.wrappedJSObject.destructor();
|
|
||||||
} catch (ex) {
|
|
||||||
// The widget may have thrown during destruction.
|
|
||||||
// Report the failure and recover by clearing the Shadow DOM.
|
|
||||||
aElement.openOrClosedShadowRoot.innerHTML = "";
|
|
||||||
Cu.reportError(ex);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
this.widgets.delete(aElement);
|
this.widgets.delete(aElement);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user