<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164165] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164165">164165</a></dd>
<dt>Author</dt> <dd>samuel_white@apple.com</dd>
<dt>Date</dt> <dd>2014-02-15 00:33:43 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Add ability to specify descendant type when using AXUIElementsForSearchPredicate.
https://bugs.webkit.org/show_bug.cgi?id=128747
Reviewed by Chris Fleizach.
Source/WebCore:
Added support for 'immediate descendant only' to existing predicate based searching. This
addition allows VoiceOver to fetch each child element lazily (rather than all at once via AXChildren).
Test: platform/mac/accessibility/search-predicate-immediate-descendants-only.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::findMatchingObjects):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilitySearchCriteria::AccessibilitySearchCriteria):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute):
Tools:
Updated uiElementCountForSearchPredicate and uiElementForSearchPredicate test methods to support 'immediate descendant only' searching.
* DumpRenderTree/AccessibilityUIElement.cpp:
(uiElementCountForSearchPredicateCallback):
(uiElementForSearchPredicateCallback):
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
(AccessibilityUIElement::uiElementCountForSearchPredicate):
(AccessibilityUIElement::uiElementForSearchPredicate):
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::uiElementCountForSearchPredicate):
(AccessibilityUIElement::uiElementForSearchPredicate):
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(searchPredicateParameterizedAttributeForSearchCriteria):
(AccessibilityUIElement::uiElementCountForSearchPredicate):
(AccessibilityUIElement::uiElementForSearchPredicate):
* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::uiElementCountForSearchPredicate):
(AccessibilityUIElement::uiElementForSearchPredicate):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::searchPredicateParameterizedAttributeForSearchCriteria):
(WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
LayoutTests:
Added test to verify that 'immediate descendant only' predicate based searching works as expected.
* platform/mac/accessibility/search-predicate-immediate-descendants-only-expected.txt: Added.
* platform/mac/accessibility/search-predicate-immediate-descendants-only.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementcpp">trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementh">trunk/Tools/DumpRenderTree/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp">trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinAccessibilityUIElementWincpp">trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitysearchpredicateimmediatedescendantsonlyexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitysearchpredicateimmediatedescendantsonlyhtml">trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/LayoutTests/ChangeLog 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-15 Samuel White <samuel_white@apple.com>
+
+ AX: Add ability to specify descendant type when using AXUIElementsForSearchPredicate.
+ https://bugs.webkit.org/show_bug.cgi?id=128747
+
+ Reviewed by Chris Fleizach.
+
+ Added test to verify that 'immediate descendant only' predicate based searching works as expected.
+
+ * platform/mac/accessibility/search-predicate-immediate-descendants-only-expected.txt: Added.
+ * platform/mac/accessibility/search-predicate-immediate-descendants-only.html: Added.
+
</ins><span class="cx"> 2014-02-14 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add back pre-r164154 results to platform/mac-mountainlion.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitysearchpredicateimmediatedescendantsonlyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only-expected.txt (0 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only-expected.txt 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests that search predicate immediate descendant only results are accurate.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS allDescendantsCount is 6
+PASS immediateDescendantsCount is 3
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitysearchpredicateimmediatedescendantsonlyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only.html (0 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/search-predicate-immediate-descendants-only.html 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<title>Search Predicate Immediate Descendants Only</title>
+</head>
+<body>
+
+<div id="container">
+<ul><li>immediate descendant</li><li><ul><li>distant descendant</li></ul></li></ul>
+<ul><li>immediate descendant</li><li><ul><li>distant descendant</li></ul></li></ul>
+<ul><li>immediate descendant</li><li><ul><li>distant descendant</li></ul></li></ul>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that search predicate immediate descendant only results are accurate.");
+
+ if (window.accessibilityController) {
+ document.getElementById("container").focus();
+ var containerElement = accessibilityController.focusedElement;
+
+ // All descendants.
+ var allDescendantsCount = containerElement.uiElementCountForSearchPredicate(null, true, "AXListSearchKey", "", false, false);
+ shouldBe("allDescendantsCount", "6");
+
+ // Immediate descendants.
+ var immediateDescendantsCount = containerElement.uiElementCountForSearchPredicate(null, true, "AXListSearchKey", "", false, true);
+ shouldBe("immediateDescendantsCount", "3");
+
+ // Hide superfluous text.
+ document.getElementById("container").style.display = "none";
+ }
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Source/WebCore/ChangeLog 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-15 Samuel White <samuel_white@apple.com>
+
+ AX: Add ability to specify descendant type when using AXUIElementsForSearchPredicate.
+ https://bugs.webkit.org/show_bug.cgi?id=128747
+
+ Reviewed by Chris Fleizach.
+
+ Added support for 'immediate descendant only' to existing predicate based searching. This
+ addition allows VoiceOver to fetch each child element lazily (rather than all at once via AXChildren).
+
+ Test: platform/mac/accessibility/search-predicate-immediate-descendants-only.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::findMatchingObjects):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilitySearchCriteria::AccessibilitySearchCriteria):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute):
+
</ins><span class="cx"> 2014-02-15 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WK2 AVKit enter fullscreen doesn't work a second time.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -499,7 +499,8 @@
</span><span class="cx"> if (objectMatchesSearchCriteriaWithResultLimit(searchObject, criteria, results))
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- appendChildrenToArray(searchObject, isForward, 0, searchStack);
</del><ins>+ if (!criteria->immediateDescendantsOnly)
+ appendChildrenToArray(searchObject, isForward, 0, searchStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (results.size() >= criteria->resultsLimit)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -341,13 +341,15 @@
</span><span class="cx"> String searchText;
</span><span class="cx"> unsigned resultsLimit;
</span><span class="cx"> bool visibleOnly;
</span><ins>+ bool immediateDescendantsOnly;
</ins><span class="cx">
</span><del>- AccessibilitySearchCriteria(AccessibilityObject* startObject, AccessibilitySearchDirection searchDirection, String searchText, unsigned resultsLimit, bool visibleOnly)
- : startObject(startObject)
- , searchDirection(searchDirection)
- , searchText(searchText)
- , resultsLimit(resultsLimit)
- , visibleOnly(visibleOnly)
</del><ins>+ AccessibilitySearchCriteria(AccessibilityObject* startObject, AccessibilitySearchDirection searchDirection, String searchText, unsigned resultsLimit, bool visibleOnly, bool immediateDescendantsOnly)
+ : startObject(startObject)
+ , searchDirection(searchDirection)
+ , searchText(searchText)
+ , resultsLimit(resultsLimit)
+ , visibleOnly(visibleOnly)
+ , immediateDescendantsOnly(immediateDescendantsOnly)
</ins><span class="cx"> { }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -201,6 +201,10 @@
</span><span class="cx"> #define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
</span><span class="cx">
</span><span class="cx"> // Search
</span><ins>+#ifndef NSAccessibilityImmediateDescendantsOnly
+#define NSAccessibilityImmediateDescendantsOnly @"AXImmediateDescendantsOnly"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute
</span><span class="cx"> #define NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute @"AXUIElementCountForSearchPredicate"
</span><span class="cx"> #endif
</span><span class="lines">@@ -209,15 +213,6 @@
</span><span class="cx"> #define NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute @"AXUIElementsForSearchPredicate"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// Text
-#ifndef NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute
-#define NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute @"AXEndTextMarkerForBounds"
-#endif
-
-#ifndef NSAccessibilityStartTextMarkerForBoundsParameterizedAttribute
-#define NSAccessibilityStartTextMarkerForBoundsParameterizedAttribute @"AXStartTextMarkerForBounds"
-#endif
-
</del><span class="cx"> // Search Keys
</span><span class="cx"> #ifndef NSAccessibilityAnyTypeSearchKey
</span><span class="cx"> #define NSAccessibilityAnyTypeSearchKey @"AXAnyTypeSearchKey"
</span><span class="lines">@@ -371,6 +366,15 @@
</span><span class="cx"> #define NSAccessibilityVisitedLinkSearchKey @"AXVisitedLinkSearchKey"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// Text markers
+#ifndef NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute
+#define NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute @"AXEndTextMarkerForBounds"
+#endif
+
+#ifndef NSAccessibilityStartTextMarkerForBoundsParameterizedAttribute
+#define NSAccessibilityStartTextMarkerForBoundsParameterizedAttribute @"AXStartTextMarkerForBounds"
+#endif
+
</ins><span class="cx"> // Text selection
</span><span class="cx"> #ifndef NSAccessibilitySelectTextActivity
</span><span class="cx"> #define NSAccessibilitySelectTextActivity @"AXSelectTextActivity"
</span><span class="lines">@@ -580,6 +584,7 @@
</span><span class="cx"> static AccessibilitySearchCriteria accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(const NSDictionary *parameterizedAttribute)
</span><span class="cx"> {
</span><span class="cx"> NSString *directionParameter = [parameterizedAttribute objectForKey:@"AXDirection"];
</span><ins>+ NSNumber *immediateDescendantsOnlyParameter = [parameterizedAttribute objectForKey:NSAccessibilityImmediateDescendantsOnly];
</ins><span class="cx"> NSNumber *resultsLimitParameter = [parameterizedAttribute objectForKey:@"AXResultsLimit"];
</span><span class="cx"> NSString *searchTextParameter = [parameterizedAttribute objectForKey:@"AXSearchText"];
</span><span class="cx"> WebAccessibilityObjectWrapper *startElementParameter = [parameterizedAttribute objectForKey:@"AXStartElement"];
</span><span class="lines">@@ -590,6 +595,10 @@
</span><span class="cx"> if ([directionParameter isKindOfClass:[NSString class]])
</span><span class="cx"> direction = [directionParameter isEqualToString:@"AXDirectionNext"] ? SearchDirectionNext : SearchDirectionPrevious;
</span><span class="cx">
</span><ins>+ bool immediateDescendantsOnly = false;
+ if ([immediateDescendantsOnlyParameter isKindOfClass:[NSNumber class]])
+ immediateDescendantsOnly = [immediateDescendantsOnlyParameter boolValue];
+
</ins><span class="cx"> unsigned resultsLimit = 0;
</span><span class="cx"> if ([resultsLimitParameter isKindOfClass:[NSNumber class]])
</span><span class="cx"> resultsLimit = [resultsLimitParameter unsignedIntValue];
</span><span class="lines">@@ -602,11 +611,11 @@
</span><span class="cx"> if ([startElementParameter isKindOfClass:[WebAccessibilityObjectWrapper class]])
</span><span class="cx"> startElement = [startElementParameter accessibilityObject];
</span><span class="cx">
</span><del>- BOOL visibleOnly = NO;
</del><ins>+ bool visibleOnly = false;
</ins><span class="cx"> if ([visibleOnlyParameter isKindOfClass:[NSNumber class]])
</span><span class="cx"> visibleOnly = [visibleOnlyParameter boolValue];
</span><span class="cx">
</span><del>- AccessibilitySearchCriteria criteria = AccessibilitySearchCriteria(startElement, direction, searchText, resultsLimit, visibleOnly);
</del><ins>+ AccessibilitySearchCriteria criteria = AccessibilitySearchCriteria(startElement, direction, searchText, resultsLimit, visibleOnly, immediateDescendantsOnly);
</ins><span class="cx">
</span><span class="cx"> if ([searchKeyParameter isKindOfClass:[NSString class]])
</span><span class="cx"> criteria.searchKeys.append(accessibilitySearchKeyForString(searchKeyParameter));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/ChangeLog 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-02-15 Samuel White <samuel_white@apple.com>
+
+ AX: Add ability to specify descendant type when using AXUIElementsForSearchPredicate.
+ https://bugs.webkit.org/show_bug.cgi?id=128747
+
+ Reviewed by Chris Fleizach.
+
+ Updated uiElementCountForSearchPredicate and uiElementForSearchPredicate test methods to support 'immediate descendant only' searching.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (uiElementCountForSearchPredicateCallback):
+ (uiElementForSearchPredicateCallback):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ (AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (AccessibilityUIElement::uiElementForSearchPredicate):
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (AccessibilityUIElement::uiElementForSearchPredicate):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (searchPredicateParameterizedAttributeForSearchCriteria):
+ (AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (AccessibilityUIElement::uiElementForSearchPredicate):
+ * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+ (AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (AccessibilityUIElement::uiElementForSearchPredicate):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::searchPredicateParameterizedAttributeForSearchCriteria):
+ (WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
+ (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
+
</ins><span class="cx"> 2014-02-15 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> CQ fix after r164105.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -209,7 +209,8 @@
</span><span class="cx"> JSValueRef searchKey = nullptr;
</span><span class="cx"> JSRetainPtr<JSStringRef> searchText = nullptr;
</span><span class="cx"> bool visibleOnly = false;
</span><del>- if (argumentCount == 5) {
</del><ins>+ bool immediateDescendantsOnly = false;
+ if (argumentCount >= 5 && argumentCount <= 6) {
</ins><span class="cx"> if (JSValueIsObject(context, arguments[0]))
</span><span class="cx"> startElement = toAXElement(JSValueToObject(context, arguments[0], exception));
</span><span class="cx">
</span><span class="lines">@@ -221,9 +222,12 @@
</span><span class="cx"> searchText.adopt(JSValueToStringCopy(context, arguments[3], exception));
</span><span class="cx">
</span><span class="cx"> visibleOnly = JSValueToBoolean(context, arguments[4]);
</span><ins>+
+ if (argumentCount == 6)
+ immediateDescendantsOnly = JSValueToBoolean(context, arguments[5]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return JSValueMakeNumber(context, toAXElement(thisObject)->uiElementCountForSearchPredicate(context, startElement, isDirectionNext, searchKey, searchText.get(), visibleOnly));
</del><ins>+ return JSValueMakeNumber(context, toAXElement(thisObject)->uiElementCountForSearchPredicate(context, startElement, isDirectionNext, searchKey, searchText.get(), visibleOnly, immediateDescendantsOnly));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSValueRef uiElementForSearchPredicateCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="lines">@@ -233,7 +237,8 @@
</span><span class="cx"> JSValueRef searchKey = nullptr;
</span><span class="cx"> JSRetainPtr<JSStringRef> searchText = nullptr;
</span><span class="cx"> bool visibleOnly = false;
</span><del>- if (argumentCount == 5) {
</del><ins>+ bool immediateDescendantsOnly = false;
+ if (argumentCount >= 5 && argumentCount <= 6) {
</ins><span class="cx"> if (JSValueIsObject(context, arguments[0]))
</span><span class="cx"> startElement = toAXElement(JSValueToObject(context, arguments[0], exception));
</span><span class="cx">
</span><span class="lines">@@ -245,9 +250,12 @@
</span><span class="cx"> searchText.adopt(JSValueToStringCopy(context, arguments[3], exception));
</span><span class="cx">
</span><span class="cx"> visibleOnly = JSValueToBoolean(context, arguments[4]);
</span><ins>+
+ if (argumentCount == 6)
+ immediateDescendantsOnly = JSValueToBoolean(context, arguments[5]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return AccessibilityUIElement::makeJSAccessibilityUIElement(context, toAXElement(thisObject)->uiElementForSearchPredicate(context, startElement, isDirectionNext, searchKey, searchText.get(), visibleOnly));
</del><ins>+ return AccessibilityUIElement::makeJSAccessibilityUIElement(context, toAXElement(thisObject)->uiElementForSearchPredicate(context, startElement, isDirectionNext, searchKey, searchText.get(), visibleOnly, immediateDescendantsOnly));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSValueRef selectTextWithCriteriaCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -208,8 +208,8 @@
</span><span class="cx"> JSStringRef stringForRange(unsigned location, unsigned length);
</span><span class="cx"> JSStringRef attributedStringForRange(unsigned location, unsigned length);
</span><span class="cx"> bool attributedStringRangeIsMisspelled(unsigned location, unsigned length);
</span><del>- unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly);
- AccessibilityUIElement uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly);
</del><ins>+ unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
+ AccessibilityUIElement uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
</ins><span class="cx"> JSStringRef selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void elementsForRange(unsigned location, unsigned length, Vector<AccessibilityUIElement>& elements);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -1197,13 +1197,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -816,13 +816,13 @@
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> return [allElementString createJSStringRef];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSDictionary *searchPredicateParameterizedAttributeForSearchCriteria(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, unsigned resultsLimit, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+static NSDictionary *searchPredicateParameterizedAttributeForSearchCriteria(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, unsigned resultsLimit, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableDictionary *parameterizedAttribute = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="lines">@@ -242,6 +242,8 @@
</span><span class="cx">
</span><span class="cx"> [parameterizedAttribute setObject:@(visibleOnly) forKey:@"AXVisibleOnly"];
</span><span class="cx">
</span><ins>+ [parameterizedAttribute setObject:@(immediateDescendantsOnly) forKey:@"AXImmediateDescendantsOnly"];
+
</ins><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1085,10 +1087,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, UINT_MAX, searchKey, searchText, visibleOnly);
</del><ins>+ NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, UINT_MAX, searchKey, searchText, visibleOnly, immediateDescendantsOnly);
</ins><span class="cx"> id value = [m_element accessibilityAttributeValue:@"AXUIElementCountForSearchPredicate" forParameter:parameterizedAttribute];
</span><span class="cx"> if ([value isKindOfClass:[NSNumber class]])
</span><span class="cx"> return [value unsignedIntValue];
</span><span class="lines">@@ -1097,10 +1099,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, 1, searchKey, searchText, visibleOnly);
</del><ins>+ NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, 1, searchKey, searchText, visibleOnly, immediateDescendantsOnly);
</ins><span class="cx"> id value = [m_element accessibilityAttributeValue:@"AXUIElementsForSearchPredicate" forParameter:parameterizedAttribute];
</span><span class="cx"> if ([value isKindOfClass:[NSArray class]])
</span><span class="cx"> return AccessibilityUIElement([value lastObject]);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinAccessibilityUIElementWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -603,12 +603,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -171,8 +171,8 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::stringForRange(unsigned, unsigned) { return 0; }
</span><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::attributedStringForRange(unsigned, unsigned) { return 0; }
</span><span class="cx"> bool AccessibilityUIElement::attributedStringRangeIsMisspelled(unsigned, unsigned) { return false; }
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool) { return 0; }
-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool) { return 0; }
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool, bool) { return 0; }
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement*, bool, JSValueRef, JSStringRef, bool, bool) { return 0; }
</ins><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef, JSValueRef, JSStringRef) { return nullptr; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::cellForColumnAndRow(unsigned, unsigned) { return 0; }
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::horizontalScrollbar() const { return 0; }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> stringForRange(unsigned location, unsigned length);
</span><span class="cx"> JSRetainPtr<JSStringRef> attributedStringForRange(unsigned location, unsigned length);
</span><span class="cx"> bool attributedStringRangeIsMisspelled(unsigned location, unsigned length);
</span><del>- unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly);
- PassRefPtr<AccessibilityUIElement> uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly);
</del><ins>+ unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
+ PassRefPtr<AccessibilityUIElement> uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly);
</ins><span class="cx"> JSRetainPtr<JSStringRef> selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString);
</span><span class="cx">
</span><span class="cx"> // Text-specific
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityUIElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> DOMString stringForRange(unsigned long location, unsigned long length);
</span><span class="cx"> DOMString attributedStringForRange(unsigned long location, unsigned long length);
</span><span class="cx"> boolean attributedStringRangeIsMisspelled(unsigned long location, unsigned long length);
</span><del>- [PassContext] unsigned int uiElementCountForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly);
- [PassContext] AccessibilityUIElement uiElementForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly);
</del><ins>+ [PassContext] unsigned int uiElementCountForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
+ [PassContext] AccessibilityUIElement uiElementForSearchPredicate(AccessibilityUIElement startElement, boolean isDirectionNext, object searchKey, DOMString searchText, boolean visibleOnly, boolean immediateDescendantsOnly);
</ins><span class="cx"> [PassContext] DOMString selectTextWithCriteria(DOMString ambiguityResolution, object searchStrings, DOMString replacementString);
</span><span class="cx"> void setSelectedTextRange(unsigned long location, unsigned long length);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -1296,13 +1296,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -468,14 +468,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (164164 => 164165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-02-15 08:30:54 UTC (rev 164164)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-02-15 08:33:43 UTC (rev 164165)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> return [allElementString createJSStringRef];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSDictionary *searchPredicateParameterizedAttributeForSearchCriteria(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, unsigned resultsLimit, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+static NSDictionary *searchPredicateParameterizedAttributeForSearchCriteria(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, unsigned resultsLimit, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableDictionary *parameterizedAttribute = [NSMutableDictionary dictionary];
</span><span class="cx">
</span><span class="lines">@@ -267,6 +267,8 @@
</span><span class="cx">
</span><span class="cx"> [parameterizedAttribute setObject:@(visibleOnly) forKey:@"AXVisibleOnly"];
</span><span class="cx">
</span><ins>+ [parameterizedAttribute setObject:@(immediateDescendantsOnly) forKey:@"AXImmediateDescendantsOnly"];
+
</ins><span class="cx"> return parameterizedAttribute;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1140,10 +1142,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, UINT_MAX, searchKey, searchText, visibleOnly);
</del><ins>+ NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, UINT_MAX, searchKey, searchText, visibleOnly, immediateDescendantsOnly);
</ins><span class="cx"> id value = [m_element accessibilityAttributeValue:@"AXUIElementCountForSearchPredicate" forParameter:parameterizedAttribute];
</span><span class="cx"> if ([value isKindOfClass:[NSNumber class]])
</span><span class="cx"> return [value unsignedIntValue];
</span><span class="lines">@@ -1152,10 +1154,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
</del><ins>+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement *startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><del>- NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, 1, searchKey, searchText, visibleOnly);
</del><ins>+ NSDictionary *parameterizedAttribute = searchPredicateParameterizedAttributeForSearchCriteria(context, startElement, isDirectionNext, 1, searchKey, searchText, visibleOnly, immediateDescendantsOnly);
</ins><span class="cx"> id value = [m_element accessibilityAttributeValue:@"AXUIElementsForSearchPredicate" forParameter:parameterizedAttribute];
</span><span class="cx"> if ([value isKindOfClass:[NSArray class]])
</span><span class="cx"> return AccessibilityUIElement::create([value lastObject]);
</span></span></pre>
</div>
</div>
</body>
</html>