Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 941787 - Fix race between tab closure event and nested event loop popping in devtools browser actor. (r=panos)

Browse Source
This commit is contained in:
Shu-yu Guo 2013-11-24 22:51:19 -08:00
parent 5a92bd2828
commit fbdf70e4d5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/devtools/server/actors/webbrowser.js
View File

@ -481,6 +481,9 @@ function BrowserTabActor(aConnection, aBrowser, aTabBrowser)
this._extraActors = {};
this._onWindowCreated = this.onWindowCreated.bind(this);
// Number of event loops nested.
this._nestedEventLoopDepth = 0;
}
// XXX (bug 710213): BrowserTabActor attach/detach/exit/disconnect is a
@ -634,6 +637,9 @@ BrowserTabActor.prototype = {
type: "tabDetached" });
}
// Pop all nested event loops if we haven't already.
while (this._nestedEventLoopDepth > 0)
this.postNest();
this._browser = null;
this._tabbrowser = null;
},
@ -782,6 +788,7 @@ BrowserTabActor.prototype = {
.getInterface(Ci.nsIDOMWindowUtils);
windowUtils.suppressEventHandling(true);
windowUtils.suspendTimeouts();
this._nestedEventLoopDepth++;
},
/**
@ -790,6 +797,8 @@ BrowserTabActor.prototype = {
postNest: function BTA_postNest(aNestData) {
if (!this.window) {
// The tab is already closed.
dbg_assert(this._nestedEventLoopDepth === 0,
"window shouldn't be closed before all nested event loops have been popped");
return;
}
let windowUtils = this.window
@ -801,6 +810,7 @@ BrowserTabActor.prototype = {
this._pendingNavigation.resume();
this._pendingNavigation = null;
}
this._nestedEventLoopDepth--;
},
/**