Skip to content
  • commit-queue@webkit.org's avatar
    Allow multiple searchKeys to be passed to AXUIElementCopyParameterizedAttributeValue · 871bfe42
    commit-queue@webkit.org authored
    https://bugs.webkit.org/show_bug.cgi?id=112276
    
    Patch by Greg Hughes <ghughes@apple.com> on 2013-03-29
    Reviewed by Chris Fleizach.
    
    Source/WebCore:
    
    Added support for accessibility search predicates to accept multiple search keys. The search will return the first item that matches any one of the provided search keys.
    
    * accessibility/AccessibilityObject.cpp:
    (WebCore::AccessibilityObject::isAccessibilityObjectSearchMatchAtIndex):
    (WebCore::AccessibilityObject::isAccessibilityObjectSearchMatch):
    (WebCore):
    * accessibility/AccessibilityObject.h:
    (AccessibilitySearchCriteria):
    (WebCore::AccessibilitySearchCriteria::AccessibilitySearchCriteria):
    (AccessibilityObject):
    * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
    (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
    
    Tools:
    
    Added support to test accessibility search predicates with multiple keys.
    
    * DumpRenderTree/AccessibilityUIElement.cpp:
    (uiElementForSearchPredicateCallback):
    * DumpRenderTree/AccessibilityUIElement.h:
    (AccessibilityUIElement):
    * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
    (AccessibilityUIElement::uiElementForSearchPredicate):
    * DumpRenderTree/blackberry/AccessibilityUIElementBlackBerry.cpp:
    (AccessibilityUIElement::uiElementForSearchPredicate):
    * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
    (AccessibilityUIElement::uiElementForSearchPredicate):
    * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
    (AccessibilityUIElement::uiElementForSearchPredicate):
    * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
    (AccessibilityUIElement::uiElementForSearchPredicate):
    * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
    (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
    * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
    (AccessibilityUIElement):
    * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
    * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
    (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
    * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
    (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
    
    LayoutTests:
    
    Updated the search predicate test to test passing multiple search keys (link OR heading).
    
    * platform/mac/accessibility/search-predicate-expected.txt:
    * platform/mac/accessibility/search-predicate.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147236 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    871bfe42