зеркало из https://github.com/mozilla/gecko-dev.git
Speculatively backout changeset 926d081e02d6 (bug 904104) for causing intermittent Windows XP debug mochitest-bc crashes.
This commit is contained in:
Родитель
dab10656bd
Коммит
818c1c026f
|
@ -66,11 +66,6 @@ function injectController(doc, topic, data) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// we always handle window.close on social content, even if they are not
|
|
||||||
// "enabled". "enabled" is about the worker state and a provider may
|
|
||||||
// still be in e.g. the share panel without having their worker enabled.
|
|
||||||
handleWindowClose(window);
|
|
||||||
|
|
||||||
SocialService.getProvider(doc.nodePrincipal.origin, function(provider) {
|
SocialService.getProvider(doc.nodePrincipal.origin, function(provider) {
|
||||||
if (provider && provider.enabled) {
|
if (provider && provider.enabled) {
|
||||||
attachToWindow(provider, window);
|
attachToWindow(provider, window);
|
||||||
|
@ -219,9 +214,7 @@ function attachToWindow(provider, targetWindow) {
|
||||||
schedule(function () { port.close(); });
|
schedule(function () { port.close(); });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function handleWindowClose(targetWindow) {
|
|
||||||
// We allow window.close() to close the panel, so add an event handler for
|
// We allow window.close() to close the panel, so add an event handler for
|
||||||
// this, then cancel the event (so the window itself doesn't die) and
|
// this, then cancel the event (so the window itself doesn't die) and
|
||||||
// close the panel instead.
|
// close the panel instead.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче