Skip to content

GitLab

T
tangled
Commit 7d22c584 authored by Adithya Srinivasan's avatar Adithya Srinivasan Committed by Commit Bot
Browse files
Options

Portals: Extract name from child tree root 

This CL adds a change similar to https://crrev.com/c/2024110, but
for the automation API.

Bug: 1057598, 1045608
Change-Id: Ib27c661a6fda9c1ac0c952abf727367d9f0a79b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2112512
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Reviewed-by: default avatarDavid Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757999}
parent 8dfb00f1
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 18 deletions
chrome/browser/resources/chromeos/accessibility/chromevox/background/portals_test.js
View file @ 7d22c584
...@@ -41,6 +41,45 @@ ChromeVoxPortalsTest = class extends ChromeVoxNextE2ETest { ...@@ -41,6 +41,45 @@ ChromeVoxPortalsTest = class extends ChromeVoxNextE2ETest {
CommandHandler.onCommand(cmd); CommandHandler.onCommand(cmd);
}; };
} }
/**
* Waits for |portal|'s tree to be ready.
* @param {chrome.automation.AutomationNode} portal
* @return {Promise}
*/
async waitForPortal(portal) {
const waitForChildren = () => new Promise(r => {
const hasChildren = () => portal.children.length > 0;
if (hasChildren()) {
r();
return;
}
const onChildrenChanged = () => {
portal.removeEventListener(
EventType.CHILDREN_CHANGED, onChildrenChanged, true);
r();
};
portal.addEventListener(
EventType.CHILDREN_CHANGED, onChildrenChanged, true);
});
const waitForLoaded = () => new Promise(r => {
const hasLoaded = () => portal.children[0].docLoaded;
if (hasLoaded()) {
r();
return;
}
const onLoadComplete = () => {
portal.removeEventListener(
EventType.LOAD_COMPLETE, onLoadComplete, true);
r();
};
portal.addEventListener(EventType.LOAD_COMPLETE, onLoadComplete, true);
});
await waitForChildren();
await waitForLoaded();
}
}; };
TEST_F('ChromeVoxPortalsTest', 'ShouldFocusPortal', function() { TEST_F('ChromeVoxPortalsTest', 'ShouldFocusPortal', function() {
...@@ -62,23 +101,24 @@ TEST_F('ChromeVoxPortalsTest', 'ShouldFocusPortal', function() { ...@@ -62,23 +101,24 @@ TEST_F('ChromeVoxPortalsTest', 'ShouldFocusPortal', function() {
doCmd('nextObject')(); doCmd('nextObject')();
}); });
const onChildrenChanged = evt => {
if (portal.children.length) {
portal.removeEventListener(
EventType.CHILDREN_CHANGED, onChildrenChanged, true);
afterPortalIsReady();
}
};
button.focus(); button.focus();
button.addEventListener(EventType.FOCUS, this.newCallback(function() { button.addEventListener(
if (!portal.children.length) { EventType.FOCUS,
portal.addEventListener( () => this.waitForPortal(portal).then(afterPortalIsReady));
EventType.CHILDREN_CHANGED, onChildrenChanged, true);
return;
}
afterPortalIsReady();
}));
}.bind(this), }.bind(this),
`${testRunnerParams.testServerBaseUrl}portal/portal-and-button.html`); `${testRunnerParams.testServerBaseUrl}portal/portal-and-button.html`);
}); });
TEST_F('ChromeVoxPortalsTest', 'PortalName', function() {
this.runWithLoadedTree(
undefined,
function(root) {
const portal = root.find({role: RoleType.PORTAL});
assertEquals(RoleType.PORTAL, portal.role);
this.waitForPortal(portal).then(this.newCallback(() => {
assertTrue(portal.firstChild.docLoaded);
assertEquals(portal.name, 'some text');
}));
}.bind(this),
`${testRunnerParams.testServerBaseUrl}portal/portal-with-text.html`);
});
chrome/test/data/portal/portal-with-text-portal.html 0 → 100644
View file @ 7d22c584
<!DOCTYPE html>
<body>
<text>some text</text>
</body>
chrome/test/data/portal/portal-with-text.html 0 → 100644
View file @ 7d22c584
<!DOCTYPE html>
<body>
<portal src="portal-with-text-portal.html"></portal>
</body>
extensions/renderer/api/automation/automation_internal_custom_bindings.cc
View file @ 7d22c584
...@@ -1151,6 +1151,25 @@ void AutomationInternalCustomBindings::AddRoutes() { ...@@ -1151,6 +1151,25 @@ void AutomationInternalCustomBindings::AddRoutes() {
v8::NewStringType::kNormal) v8::NewStringType::kNormal)
.ToLocalChecked()); .ToLocalChecked());
}); });
RouteNodeIDFunction("GetName", [this](v8::Isolate* isolate,
v8::ReturnValue<v8::Value> result,
AutomationAXTreeWrapper* tree_wrapper,
ui::AXNode* node) {
const ui::AXNodeData& node_data = node->data();
const char* name =
node_data.GetStringAttribute(ax::mojom::StringAttribute::kName).c_str();
if (node_data.role == ax::mojom::Role::kPortal &&
node_data.GetNameFrom() == ax::mojom::NameFrom::kNone) {
if (GetRootOfChildTree(&node, &tree_wrapper)) {
name = node->data()
.GetStringAttribute(ax::mojom::StringAttribute::kName)
.c_str();
}
}
result.Set(
v8::String::NewFromUtf8(isolate, name, v8::NewStringType::kNormal)
.ToLocalChecked());
});
RouteNodeIDFunction( RouteNodeIDFunction(
"GetDescriptionFrom", "GetDescriptionFrom",
[](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result, [](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result,
......
extensions/renderer/resources/automation/automation_node.js
View file @ 7d22c584
...@@ -262,6 +262,13 @@ var GetUnclippedLocation = natives.GetUnclippedLocation; ...@@ -262,6 +262,13 @@ var GetUnclippedLocation = natives.GetUnclippedLocation;
var GetLineStartOffsets = requireNative( var GetLineStartOffsets = requireNative(
'automationInternal').GetLineStartOffsets; 'automationInternal').GetLineStartOffsets;
/**
* @param {string} axTreeID The id of the accessibility tree.
* @param {number} nodeID The id of the node.
* @return {?string} The computed name of this node.
*/
var GetName = natives.GetName;
/** /**
* @param {string} axTreeID The id of the accessibility tree. * @param {string} axTreeID The id of the accessibility tree.
* @param {number} nodeID The id of a node. * @param {number} nodeID The id of a node.
...@@ -700,6 +707,9 @@ AutomationNodeImpl.prototype = { ...@@ -700,6 +707,9 @@ AutomationNodeImpl.prototype = {
return GetNameFrom(this.treeID, this.id); return GetNameFrom(this.treeID, this.id);
}, },
get name() {
return GetName(this.treeID, this.id);
},
get descriptionFrom() { get descriptionFrom() {
return GetDescriptionFrom(this.treeID, this.id); return GetDescriptionFrom(this.treeID, this.id);
...@@ -1036,7 +1046,7 @@ AutomationNodeImpl.prototype = { ...@@ -1036,7 +1046,7 @@ AutomationNodeImpl.prototype = {
var childID = GetChildIDAtIndex(this.treeID, this.id, i).nodeId; var childID = GetChildIDAtIndex(this.treeID, this.id, i).nodeId;
$Array.push(childIDs, childID); $Array.push(childIDs, childID);
} }
var name = GetStringAttribute(this.treeID, this.id, 'name'); var name = GetName(this.treeID, this.id);
var result = 'node id=' + this.id + var result = 'node id=' + this.id +
' role=' + this.role + ' role=' + this.role +
...@@ -1231,7 +1241,6 @@ var stringAttributes = [ ...@@ -1231,7 +1241,6 @@ var stringAttributes = [
'language', 'language',
'liveRelevant', 'liveRelevant',
'liveStatus', 'liveStatus',
'name',
'placeholder', 'placeholder',
'roleDescription', 'roleDescription',
'textInputType', 'textInputType',
...@@ -1815,6 +1824,7 @@ utils.expose(AutomationNode, AutomationNodeImpl, { ...@@ -1815,6 +1824,7 @@ utils.expose(AutomationNode, AutomationNodeImpl, {
'lineThrough', 'lineThrough',
'location', 'location',
'markers', 'markers',
'name',
'nameFrom', 'nameFrom',
'nextSibling', 'nextSibling',
'nonInlineTextWordEnds', 'nonInlineTextWordEnds',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment