Bug 1348318 - Avoid toolbox.win.top with undocked toolboxes. r=ochameau
`toolbox.win.top` is a bit suspect when we support undocked toolboxes, as this
doesn't allow you to reach a browser window for the toolbox. Here we take a
different approach that should work for all docking types.
MozReview-Commit-ID: 5mlsp4OyZrc
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@@ -746,17 +746,17 @@ var gDevToolsBrowser = exports.gDevTools
}
gDevToolsBrowser._trackedBrowserWindows.delete(win);
win.removeEventListener("unload", this);
BrowserMenus.removeMenus(win.document);
// Destroy toolboxes for closed window
for (let [target, toolbox] of gDevTools._toolboxes) {
- if (toolbox.win.top == win) {
+ if (target.tab && target.tab.ownerDocument.defaultView == win) {
toolbox.destroy();
}
}
// Destroy the Developer toolbar if it has been accessed
let desc = Object.getOwnPropertyDescriptor(win, "DeveloperToolbar");
if (desc && !desc.get) {
win.DeveloperToolbar.destroy();