Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1692468 - [marionette] Refactor starting and stopping of observing windows. r=webdriver-reviewers,jdescottes

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D164741
This commit is contained in:
Henrik Skupin 2023-01-01 20:24:01 +00:00
parent bfa92bc158
commit ffe403d95c
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
remote/marionette/driver.sys.mjs
View File

@ -451,16 +451,7 @@ GeckoDriver.prototype.newSession = async function(cmd) {
this.dialogObserver.add(this.handleModalDialog.bind(this));
for (let win of lazy.windowManager.windows) {
const tabBrowser = lazy.TabManager.getTabBrowser(win);
if (tabBrowser) {
for (const tab of tabBrowser.tabs) {
const contentBrowser = lazy.TabManager.getBrowserForTab(tab);
this.registerBrowser(contentBrowser);
}
}
this.registerListenersForWindow(win);
this.registerWindow(win, { registerBrowsers: true });
}
if (this.mainFrame) {
@ -498,25 +489,36 @@ GeckoDriver.prototype.newSession = async function(cmd) {
};
/**
* Register event listeners for the specified window.
* Start observing the specified window.
*
* @param {ChromeWindow} win
* Chrome window to register event listeners for.
* @param {Object=} options
* @param {boolean=} options.registerBrowsers
* If true, register all content browsers of found tabs. Defaults to false.
*/
GeckoDriver.prototype.registerListenersForWindow = function(win) {
GeckoDriver.prototype.registerWindow = function(win, options = {}) {
const { registerBrowsers = false } = options;
const tabBrowser = lazy.TabManager.getTabBrowser(win);
if (registerBrowsers && tabBrowser) {
for (const tab of tabBrowser.tabs) {
const contentBrowser = lazy.TabManager.getBrowserForTab(tab);
this.registerBrowser(contentBrowser);
}
}
// Listen for any kind of top-level process switch
tabBrowser?.addEventListener("XULFrameLoaderCreated", this);
};
/**
* Unregister event listeners for the specified window.
* Stop observing the specified window.
*
* @param {ChromeWindow} win
* Chrome window to unregister event listeners for.
*/
GeckoDriver.prototype.unregisterListenersForWindow = function(win) {
GeckoDriver.prototype.stopObservingWindow = function(win) {
const tabBrowser = lazy.TabManager.getTabBrowser(win);
tabBrowser?.removeEventListener("XULFrameLoaderCreated", this);
@ -540,7 +542,7 @@ GeckoDriver.prototype.handleEvent = function({ target, type }) {
GeckoDriver.prototype.observe = function(subject, topic, data) {
switch (topic) {
case TOPIC_BROWSER_READY:
this.registerListenersForWindow(subject);
this.registerWindow(subject);
break;
}
};
@ -2253,7 +2255,7 @@ GeckoDriver.prototype.deleteSession = function() {
}
for (let win of lazy.windowManager.windows) {
this.unregisterListenersForWindow(win);
this.stopObservingWindow(win);
}
// reset to the top-most frame