Backed out changeset 97707eff3199 (bug 1059308)

This commit is contained in:
Carsten "Tomcat" Book 2015-03-03 16:28:16 +01:00
Родитель 5035a908b0
Коммит 11d02f6444
1 изменённых файлов: 4 добавлений и 18 удалений

Просмотреть файл

@ -1017,24 +1017,10 @@ TabActor.prototype = {
}
if (webProgress.DOMWindow == this._originalWindow) {
// If the original top level document we connected to is removed,
// we try to switch to any other top level document
let rootDocShells = this.docShells
.filter(d => {
return d != this.docShell &&
this._isRootDocShell(d);
});
if (rootDocShells.length > 0) {
let newRoot = rootDocShells[0];
this._originalWindow = newRoot.DOMWindow;
this._changeTopLevelDocument(this._originalWindow);
} else {
// If for some reason (typically during Firefox shutdown), the original
// document is destroyed, and there is no other top level docshell,
// we detach the tab actor to unregister all listeners and prevent any
// exception
this.exit();
}
// If for some reason (typically during Firefox shutdown), the original
// document is destroyed, we detach the tab actor to unregister all listeners
// and prevent any exception.
this.exit();
return;
}