summaryrefslogtreecommitdiffstats
path: root/remote/marionette/actors
diff options
context:
space:
mode:
Diffstat (limited to 'remote/marionette/actors')
-rw-r--r--remote/marionette/actors/MarionetteCommandsChild.sys.mjs23
1 files changed, 4 insertions, 19 deletions
diff --git a/remote/marionette/actors/MarionetteCommandsChild.sys.mjs b/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
index d454e03fb0..e4db24b1e6 100644
--- a/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
+++ b/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
@@ -7,7 +7,8 @@
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
- accessibility: "chrome://remote/content/marionette/accessibility.sys.mjs",
+ accessibility:
+ "chrome://remote/content/shared/webdriver/Accessibility.sys.mjs",
action: "chrome://remote/content/shared/webdriver/Actions.sys.mjs",
atom: "chrome://remote/content/marionette/atom.sys.mjs",
dom: "chrome://remote/content/shared/DOM.sys.mjs",
@@ -282,17 +283,7 @@ export class MarionetteCommandsChild extends JSWindowActorChild {
async getComputedLabel(options = {}) {
const { elem } = options;
- const accessible = await lazy.accessibility.getAccessible(elem);
- if (!accessible) {
- return "";
- }
-
- // If name is null (absent), expose the empty string.
- if (accessible.name === null) {
- return "";
- }
-
- return accessible.name;
+ return lazy.accessibility.getAccessibleName(elem);
}
/**
@@ -301,13 +292,7 @@ export class MarionetteCommandsChild extends JSWindowActorChild {
async getComputedRole(options = {}) {
const { elem } = options;
- const accessible = await lazy.accessibility.getAccessible(elem);
- if (!accessible) {
- // If it's not in the a11y tree, it's probably presentational.
- return "none";
- }
-
- return accessible.computedARIARole;
+ return lazy.accessibility.getComputedRole(elem);
}
/**