summaryrefslogtreecommitdiffstats
path: root/remote/marionette
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
commitd8bbc7858622b6d9c278469aab701ca0b609cddf (patch)
treeeff41dc61d9f714852212739e6b3738b82a2af87 /remote/marionette
parentReleasing progress-linux version 125.0.3-1~progress7.99u1. (diff)
downloadfirefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz
firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'remote/marionette')
-rw-r--r--remote/marionette/actors/MarionetteCommandsChild.sys.mjs2
-rw-r--r--remote/marionette/browser.sys.mjs19
-rw-r--r--remote/marionette/driver.sys.mjs17
3 files changed, 2 insertions, 36 deletions
diff --git a/remote/marionette/actors/MarionetteCommandsChild.sys.mjs b/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
index 078612da56..d454e03fb0 100644
--- a/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
+++ b/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
@@ -284,7 +284,7 @@ export class MarionetteCommandsChild extends JSWindowActorChild {
const accessible = await lazy.accessibility.getAccessible(elem);
if (!accessible) {
- return null;
+ return "";
}
// If name is null (absent), expose the empty string.
diff --git a/remote/marionette/browser.sys.mjs b/remote/marionette/browser.sys.mjs
index d9a867fac5..397bb75a1e 100644
--- a/remote/marionette/browser.sys.mjs
+++ b/remote/marionette/browser.sys.mjs
@@ -145,23 +145,6 @@ browser.Context = class {
}
/**
- * Retrieves the current tabmodal UI object. According to the browser
- * associated with the currently selected tab.
- */
- getTabModal() {
- let br = this.contentBrowser;
- if (!br.hasAttribute("tabmodalPromptShowing")) {
- return null;
- }
-
- // The modal is a direct sibling of the browser element.
- // See tabbrowser.xml's getTabModalPromptBox.
- let modalElements = br.parentNode.getElementsByTagName("tabmodalprompt");
-
- return br.tabModalPromptBox.getPrompt(modalElements[0]);
- }
-
- /**
* Close the current window.
*
* @returns {Promise}
@@ -254,7 +237,7 @@ browser.Context = class {
tab = await lazy.TabManager.addTab({ focus, window: this.window });
} else if (lazy.AppInfo.isFirefox) {
const opened = new lazy.EventPromise(this.window, "TabOpen");
- this.window.BrowserOpenTab({ url: "about:blank" });
+ this.window.BrowserCommands.openTab({ url: "about:blank" });
await opened;
tab = this.tabBrowser.selectedTab;
diff --git a/remote/marionette/driver.sys.mjs b/remote/marionette/driver.sys.mjs
index f4642e756e..6b5b1cf082 100644
--- a/remote/marionette/driver.sys.mjs
+++ b/remote/marionette/driver.sys.mjs
@@ -3346,23 +3346,6 @@ GeckoDriver.prototype.setPermission = async function (cmd) {
const { descriptor, state, oneRealm = false } = cmd.parameters;
const browsingContext = lazy.assert.open(this.getBrowsingContext());
- // XXX: WPT should not have these but currently they do and we pass testing pref to
- // pass them, see bug 1875837.
- if (
- ["clipboard-read", "clipboard-write"].includes(descriptor.name) &&
- state === "granted"
- ) {
- if (
- Services.prefs.getBoolPref("dom.events.testing.asyncClipboard", false)
- ) {
- // Okay, do nothing. The clipboard module will work without permission.
- return;
- }
- throw new lazy.error.UnsupportedOperationError(
- "setPermission: expected dom.events.testing.asyncClipboard to be set"
- );
- }
-
// XXX: We currently depend on camera/microphone tests throwing UnsupportedOperationError,
// the fix is ongoing in bug 1609427.
if (["camera", "microphone"].includes(descriptor.name)) {