<!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>[164615] 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/164615">164615</a></dd>
<dt>Author</dt> <dd>samuel_white@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 16:08:50 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: findMatchingObjects backwards start position inconsistent with forwards start position when startObject == nullptr.
https://bugs.webkit.org/show_bug.cgi?id=129266
Reviewed by Chris Fleizach.
Source/WebCore:
When searching forward with no start object, the first thing considered is the first child of
the container. However, when searching backwards with no start object nothing in the container
is considered; this basically negates the search. This patch makes backwards searching without
a start object start from the last child of the container to match forward search expectations.
Test: platform/mac/accessibility/search-predicate-start-not-specified.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::findMatchingObjects):
LayoutTests:
Added test to ensure that searching backward & forward without a start object produces similar
results. Backward will begin from the end of the container and forward will begin from the start.
* platform/mac/accessibility/search-predicate-start-not-specified-expected.txt: Added.
* platform/mac/accessibility/search-predicate-start-not-specified.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitysearchpredicatestartnotspecifiedexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitysearchpredicatestartnotspecifiedhtml">trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164614 => 164615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-24 23:25:25 UTC (rev 164614)
+++ trunk/LayoutTests/ChangeLog 2014-02-25 00:08:50 UTC (rev 164615)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-24 Samuel White <samuel_white@apple.com>
+
+ AX: findMatchingObjects backwards start position inconsistent with forwards start position when startObject == nullptr.
+ https://bugs.webkit.org/show_bug.cgi?id=129266
+
+ Reviewed by Chris Fleizach.
+
+ Added test to ensure that searching backward & forward without a start object produces similar
+ results. Backward will begin from the end of the container and forward will begin from the start.
+
+ * platform/mac/accessibility/search-predicate-start-not-specified-expected.txt: Added.
+ * platform/mac/accessibility/search-predicate-start-not-specified.html: Added.
+
</ins><span class="cx"> 2014-02-24 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitysearchpredicatestartnotspecifiedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified-expected.txt (0 => 164615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified-expected.txt 2014-02-25 00:08:50 UTC (rev 164615)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests that search predicate results are accurate when no start element is specified.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS backwardResult.description is 'AXDescription: last'
+PASS forwardResult.description is 'AXDescription: first'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitysearchpredicatestartnotspecifiedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified.html (0 => 164615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/search-predicate-start-not-specified.html 2014-02-25 00:08:50 UTC (rev 164615)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<title>Search Predicate Start Not Specified</title>
+</head>
+<body>
+
+<ul id="container"><li aria-label="first">item</li><li aria-label="middle">item</li><li aria-label="last">item</li></ul>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that search predicate results are accurate when no start element is specified.");
+
+ if (window.accessibilityController) {
+ var containerElement = accessibilityController.accessibleElementById("container");
+
+ // Backward search with no start element.
+ var backwardResult = containerElement.uiElementForSearchPredicate(null, false, "AXAnyTypeSearchKey", "", false);
+ shouldBe("backwardResult.description", "'AXDescription: last'");
+
+ // Forward search with no start element.
+ var forwardResult = containerElement.uiElementForSearchPredicate(null, true, "AXAnyTypeSearchKey", "", false);
+ shouldBe("forwardResult.description", "'AXDescription: first'");
+
+ // 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 (164614 => 164615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-24 23:25:25 UTC (rev 164614)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 00:08:50 UTC (rev 164615)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-24 Samuel White <samuel_white@apple.com>
+
+ AX: findMatchingObjects backwards start position inconsistent with forwards start position when startObject == nullptr.
+ https://bugs.webkit.org/show_bug.cgi?id=129266
+
+ Reviewed by Chris Fleizach.
+
+ When searching forward with no start object, the first thing considered is the first child of
+ the container. However, when searching backwards with no start object nothing in the container
+ is considered; this basically negates the search. This patch makes backwards searching without
+ a start object start from the last child of the container to match forward search expectations.
+
+ Test: platform/mac/accessibility/search-predicate-start-not-specified.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::findMatchingObjects):
+
</ins><span class="cx"> 2014-02-24 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Prune dead code for Web Inspector canvas instrumentation.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (164614 => 164615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-24 23:25:25 UTC (rev 164614)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-25 00:08:50 UTC (rev 164615)
</span><span class="lines">@@ -475,10 +475,11 @@
</span><span class="cx">
</span><span class="cx"> bool isForward = criteria->searchDirection == SearchDirectionNext;
</span><span class="cx">
</span><del>- // In the first iteration of the loop, it will examine the children of the start object for matches.
- // However, when going backwards, those children should not be considered, so the loop is skipped ahead.
</del><ins>+ // The first iteration of the outer loop will examine the children of the start object for matches. However, when
+ // iterating backwards, the start object children should not be considered, so the loop is skipped ahead. We make an
+ // exception when no start object was specified because we want to search everything regardless of search direction.
</ins><span class="cx"> AccessibilityObject* previousObject = 0;
</span><del>- if (!isForward) {
</del><ins>+ if (!isForward && startObject != this) {
</ins><span class="cx"> previousObject = startObject;
</span><span class="cx"> startObject = startObject->parentObjectUnignored();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>