Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1668137 - Use search root for rule's aDirectDescendantsFrom argument. r=morgan

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D91875
This commit is contained in:
Eitan Isaacson 2020-10-01 18:56:52 +00:00
parent adaaa1af2c
commit f4182287b4
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
accessible/mac/MOXSearchInfo.mm
View File

@ -98,12 +98,12 @@ using namespace mozilla::a11y;
}
- (NSArray*)performSearch {
AccessibleOrProxy geckoStartAcc = [self startGeckoAccessible];
AccessibleOrProxy geckoRootAcc = [self rootGeckoAccessible];
NSMutableArray* matches = [[NSMutableArray alloc] init];
for (id key in mSearchKeys) {
if ([key isEqualToString:@"AXAnyTypeSearchKey"]) {
RotorRule rule =
mImmediateDescendantsOnly ? RotorRule(geckoStartAcc) : RotorRule();
mImmediateDescendantsOnly ? RotorRule(geckoRootAcc) : RotorRule();
if (mSearchForward) {
if ([mStartElem isKindOfClass:[MOXWebAreaAccessible class]]) {
@ -136,92 +136,91 @@ using namespace mozilla::a11y;
if ([key isEqualToString:@"AXHeadingSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::HEADING, geckoStartAcc)
? RotorRoleRule(roles::HEADING, geckoRootAcc)
: RotorRoleRule(roles::HEADING);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXArticleSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::ARTICLE, geckoStartAcc)
? RotorRoleRule(roles::ARTICLE, geckoRootAcc)
: RotorRoleRule(roles::ARTICLE);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXTableSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::TABLE, geckoStartAcc)
? RotorRoleRule(roles::TABLE, geckoRootAcc)
: RotorRoleRule(roles::TABLE);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXLandmarkSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::LANDMARK, geckoStartAcc)
? RotorRoleRule(roles::LANDMARK, geckoRootAcc)
: RotorRoleRule(roles::LANDMARK);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXListSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::LIST, geckoStartAcc)
? RotorRoleRule(roles::LIST, geckoRootAcc)
: RotorRoleRule(roles::LIST);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXLinkSearchKey"]) {
RotorLinkRule rule = mImmediateDescendantsOnly
? RotorLinkRule(geckoStartAcc)
? RotorLinkRule(geckoRootAcc)
: RotorLinkRule();
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXVisitedLinkSearchKey"]) {
RotorVisitedLinkRule rule = mImmediateDescendantsOnly
? RotorVisitedLinkRule(geckoStartAcc)
? RotorVisitedLinkRule(geckoRootAcc)
: RotorVisitedLinkRule();
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXUnvisitedLinkSearchKey"]) {
RotorUnvisitedLinkRule rule = mImmediateDescendantsOnly
? RotorUnvisitedLinkRule(geckoStartAcc)
? RotorUnvisitedLinkRule(geckoRootAcc)
: RotorUnvisitedLinkRule();
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXButtonSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::PUSHBUTTON, geckoStartAcc)
? RotorRoleRule(roles::PUSHBUTTON, geckoRootAcc)
: RotorRoleRule(roles::PUSHBUTTON);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXControlSearchKey"]) {
RotorControlRule rule = mImmediateDescendantsOnly
? RotorControlRule(geckoStartAcc)
? RotorControlRule(geckoRootAcc)
: RotorControlRule();
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXRadioGroupSearchKey"]) {
RotorRoleRule rule =
mImmediateDescendantsOnly
? RotorRoleRule(roles::RADIO_GROUP, geckoStartAcc)
: RotorRoleRule(roles::RADIO_GROUP);
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::RADIO_GROUP, geckoRootAcc)
: RotorRoleRule(roles::RADIO_GROUP);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXFrameSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::DOCUMENT, geckoStartAcc)
? RotorRoleRule(roles::DOCUMENT, geckoRootAcc)
: RotorRoleRule(roles::DOCUMENT);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}
if ([key isEqualToString:@"AXImageSearchKey"]) {
RotorRoleRule rule = mImmediateDescendantsOnly
? RotorRoleRule(roles::GRAPHIC, geckoStartAcc)
? RotorRoleRule(roles::GRAPHIC, geckoRootAcc)
: RotorRoleRule(roles::GRAPHIC);
[matches addObjectsFromArray:[self getMatchesForRule:rule]];
}

25
accessible/tests/browser/mac/browser_rotor.js
View File

@ -1483,7 +1483,10 @@ addAccessibleTask(
* Test search with non-webarea root
*/
addAccessibleTask(
`<div id="searchroot"><p>hello</p><p>world</p></div><div><p>goodybe</p></div>`,
`
<div id="searchroot"><p id="p1">hello</p><p id="p2">world</p></div>
<div><p>goodybe</p></div>
`,
async (browser, accDoc) => {
let searchPred = {
AXSearchKey: "AXAnyTypeSearchKey",
@ -1498,5 +1501,25 @@ addAccessibleTask(
NSDictionary(searchPred)
);
is(resultCount, 2, "Found 2 items");
const p1 = getNativeInterface(accDoc, "p1");
searchPred = {
AXSearchKey: "AXAnyTypeSearchKey",
AXImmediateDescendantsOnly: 1,
AXResultsLimit: -1,
AXDirection: "AXDirectionNext",
AXStartElement: p1,
};
let results = searchRoot.getParameterizedAttributeValue(
"AXUIElementsForSearchPredicate",
NSDictionary(searchPred)
);
Assert.deepEqual(
results.map(r => r.getAttributeValue("AXDOMIdentifier")),
["p2"],
"Result is next group sibling"
);
}
);