Backed out 2 changesets (bug 1668142, bug 1668137) for build bustage on MOXSearchInfo.mm. CLOSED TREE

Backed out changeset 05c9cc6dd872 (bug 1668142)
Backed out changeset 4c62dd862ae3 (bug 1668137)

accessible/mac/MOXSearchInfo.mm

@@ -77,22 +77,9 @@ using namespace mozilla::a11y;
   AccessibleOrProxy geckoRootAcc = [self rootGeckoAccessible];
   AccessibleOrProxy geckoStartAcc = [self startGeckoAccessible];
   Pivot p = Pivot(geckoRootAcc);
-  AccessibleOrProxy match;
-  if (mSearchForward) {
-    match = p.Next(geckoStartAcc, rule);
-  } else {
-    if (geckoRootAcc == geckoStartAcc) {
-      match = p.Last(rule);
-    } else {
-      match = p.Prev(geckoStartAcc, rule);
-    }
-  }
-
+  AccessibleOrProxy match = mSearchForward ? p.Next(geckoStartAcc, rule)
+                                           : p.Prev(geckoStartAcc, rule);
   while (!match.IsNull() && resultLimit != 0) {
-    if (!mSearchForward && match == geckoRootAcc) {
-      break;
-    }
-
     // we use mResultLimit != 0 to capture the case where mResultLimit is -1
     // when it is set from the params dictionary. If that's true, we want
     // to return all matches (ie. have no limit)
@@ -111,12 +98,12 @@ using namespace mozilla::a11y;
 }
 
 - (NSArray*)performSearch {
-  AccessibleOrProxy geckoRootAcc = [self rootGeckoAccessible];
+  AccessibleOrProxy geckoStartAcc = [self startGeckoAccessible];
   NSMutableArray* matches = [[NSMutableArray alloc] init];
   for (id key in mSearchKeys) {
     if ([key isEqualToString:@"AXAnyTypeSearchKey"]) {
       RotorRule rule =
-          mImmediateDescendantsOnly ? RotorRule(geckoRootAcc) : RotorRule();
+          mImmediateDescendantsOnly ? RotorRule(geckoStartAcc) : RotorRule();
 
       if (mSearchForward) {
         if ([mStartElem isKindOfClass:[MOXWebAreaAccessible class]]) {
@@ -149,91 +136,92 @@ using namespace mozilla::a11y;
 
     if ([key isEqualToString:@"AXHeadingSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::HEADING, geckoRootAcc)
+                               ? RotorRoleRule(roles::HEADING, geckoStartAcc)
                                : RotorRoleRule(roles::HEADING);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXArticleSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::ARTICLE, geckoRootAcc)
+                               ? RotorRoleRule(roles::ARTICLE, geckoStartAcc)
                                : RotorRoleRule(roles::ARTICLE);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXTableSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::TABLE, geckoRootAcc)
+                               ? RotorRoleRule(roles::TABLE, geckoStartAcc)
                                : RotorRoleRule(roles::TABLE);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXLandmarkSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::LANDMARK, geckoRootAcc)
+                               ? RotorRoleRule(roles::LANDMARK, geckoStartAcc)
                                : RotorRoleRule(roles::LANDMARK);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXListSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::LIST, geckoRootAcc)
+                               ? RotorRoleRule(roles::LIST, geckoStartAcc)
                                : RotorRoleRule(roles::LIST);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXLinkSearchKey"]) {
       RotorLinkRule rule = mImmediateDescendantsOnly
-                               ? RotorLinkRule(geckoRootAcc)
+                               ? RotorLinkRule(geckoStartAcc)
                                : RotorLinkRule();
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXVisitedLinkSearchKey"]) {
       RotorVisitedLinkRule rule = mImmediateDescendantsOnly
-                                      ? RotorVisitedLinkRule(geckoRootAcc)
+                                      ? RotorVisitedLinkRule(geckoStartAcc)
                                       : RotorVisitedLinkRule();
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXUnvisitedLinkSearchKey"]) {
       RotorUnvisitedLinkRule rule = mImmediateDescendantsOnly
-                                        ? RotorUnvisitedLinkRule(geckoRootAcc)
+                                        ? RotorUnvisitedLinkRule(geckoStartAcc)
                                         : RotorUnvisitedLinkRule();
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXButtonSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::PUSHBUTTON, geckoRootAcc)
+                               ? RotorRoleRule(roles::PUSHBUTTON, geckoStartAcc)
                                : RotorRoleRule(roles::PUSHBUTTON);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXControlSearchKey"]) {
       RotorControlRule rule = mImmediateDescendantsOnly
-                                  ? RotorControlRule(geckoRootAcc)
+                                  ? RotorControlRule(geckoStartAcc)
                                   : RotorControlRule();
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXRadioGroupSearchKey"]) {
-      RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::RADIO_GROUP, geckoRootAcc)
-                               : RotorRoleRule(roles::RADIO_GROUP);
+      RotorRoleRule rule =
+          mImmediateDescendantsOnly
+              ? RotorRoleRule(roles::RADIO_GROUP, geckoStartAcc)
+              : RotorRoleRule(roles::RADIO_GROUP);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXFrameSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::DOCUMENT, geckoRootAcc)
+                               ? RotorRoleRule(roles::DOCUMENT, geckoStartAcc)
                                : RotorRoleRule(roles::DOCUMENT);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
     if ([key isEqualToString:@"AXImageSearchKey"]) {
       RotorRoleRule rule = mImmediateDescendantsOnly
-                               ? RotorRoleRule(roles::GRAPHIC, geckoRootAcc)
+                               ? RotorRoleRule(roles::GRAPHIC, geckoStartAcc)
                                : RotorRoleRule(roles::GRAPHIC);
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }

accessible/tests/browser/mac/browser_rotor.js

@@ -1483,10 +1483,7 @@ addAccessibleTask(
  * Test search with non-webarea root
  */
 addAccessibleTask(
-  `
-  <div id="searchroot"><p id="p1">hello</p><p id="p2">world</p></div>
-  <div><p>goodybe</p></div>
-  `,
+  `<div id="searchroot"><p>hello</p><p>world</p></div><div><p>goodybe</p></div>`,
   async (browser, accDoc) => {
     let searchPred = {
       AXSearchKey: "AXAnyTypeSearchKey",
@@ -1501,43 +1498,5 @@ 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"
-    );
-
-    searchPred = {
-      AXSearchKey: "AXAnyTypeSearchKey",
-      AXImmediateDescendantsOnly: 1,
-      AXResultsLimit: -1,
-      AXDirection: "AXDirectionPrevious",
-    };
-
-    results = searchRoot.getParameterizedAttributeValue(
-      "AXUIElementsForSearchPredicate",
-      NSDictionary(searchPred)
-    );
-
-    Assert.deepEqual(
-      results.map(r => r.getAttributeValue("AXDOMIdentifier")),
-      ["p2", "p1"],
-      "A reverse search should return groups in reverse"
-    );
   }
 );