Changeset 220065 in webkit

Timestamp:

Jul 31, 2017, 7:37:37 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220042. rdar://problem/33619586

Location:

branches/safari-604-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/search-predicate-from-ignored-element-expected.txt (added)
• LayoutTests/accessibility/mac/search-predicate-from-ignored-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)

branches/safari-604-branch/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220042. rdar://problem/33619586
+
+    2017-07-29  Nan Wang  <n_wang@apple.com>
+
+            AX: findMatchingObjects doesn't work when the startObject is ignored
+            https://bugs.webkit.org/show_bug.cgi?id=174965
+
+            Reviewed by Chris Fleizach.
+
+            * accessibility/mac/search-predicate-from-ignored-element-expected.txt: Added.
+            * accessibility/mac/search-predicate-from-ignored-element.html: Added.
+
 2017-07-31  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220042. rdar://problem/33619586
+
+    2017-07-29  Nan Wang  <n_wang@apple.com>
+
+            AX: findMatchingObjects doesn't work when the startObject is ignored
+            https://bugs.webkit.org/show_bug.cgi?id=174965
+
+            Reviewed by Chris Fleizach.
+
+            findMatchingObjects would return a wrong element if we pass in an ignored
+            start object. To fix this, we should use the closest accessible sibling as
+            the start object.
+
+            Test: accessibility/mac/search-predicate-from-ignored-element.html
+
+            * accessibility/AccessibilityObject.cpp:
+            (WebCore::appendChildrenToArray):
+
 2017-07-31  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -611 +611 @@
     size_t endIndex = isForward ? 0 : childrenSize;
 
+    // If the startObject is ignored, we should use an accessible sibling as a start element instead.
+    if (startObject && startObject->accessibilityIsIgnored() && startObject->isDescendantOfObject(object)) {
+        AccessibilityObject* parentObject = startObject->parentObject();
+        // Go up the parent chain to find the highest ancestor that's also being ignored.
+        while (parentObject && parentObject->accessibilityIsIgnored()) {
+            if (parentObject == object)
+                break;
+            startObject = parentObject;
+            parentObject = parentObject->parentObject();
+        }
+        // Get the un-ignored sibling based on the search direction, and update the searchPosition.
+        while (startObject && startObject->accessibilityIsIgnored())
+            startObject = isForward ? startObject->previousSibling() : startObject->nextSibling();
+    }
+    
     size_t searchPosition = startObject ? searchChildren.find(startObject) : WTF::notFound;
+    
     if (searchPosition != WTF::notFound) {
         if (isForward)