<!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>[171997] 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/171997">171997</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-08-04 10:42:44 -0700 (Mon, 04 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: SelectText functionality always selects text after current selection even if closer selection is behind it
https://bugs.webkit.org/show_bug.cgi?id=135546
Reviewed by Mario Sanchez Prada.
Source/WebCore:
Logic was incorrect for comparing ranges found before the current selection.
ASSERT was incorrect for allowed ranges. We need to allow ranges that are right at the boundaries of our found ranges.
Extended existing test: platform/mac/accessibility/select-text.html
* accessibility/AccessibilityObject.cpp:
(WebCore::rangeClosestToRange):
LayoutTests:
* platform/mac/accessibility/select-text-expected.txt:
* platform/mac/accessibility/select-text.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselecttextexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselecttexthtml">trunk/LayoutTests/platform/mac/accessibility/select-text.html</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171996 => 171997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-04 17:32:21 UTC (rev 171996)
+++ trunk/LayoutTests/ChangeLog 2014-08-04 17:42:44 UTC (rev 171997)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-08-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><ins>+ AX: SelectText functionality always selects text after current selection even if closer selection is behind it
+ https://bugs.webkit.org/show_bug.cgi?id=135546
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/select-text-expected.txt:
+ * platform/mac/accessibility/select-text.html:
+
+2014-08-04 Chris Fleizach <cfleizach@apple.com>
+
</ins><span class="cx"> AX: AXSelectTextWithCriteriaParameterizedAttribute incorrectly selects the beginning letters of a word
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135547
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt (171996 => 171997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-08-04 17:32:21 UTC (rev 171996)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text-expected.txt 2014-08-04 17:42:44 UTC (rev 171997)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> The slow BROWN cat jumps over the lazy dog.
</span><span class="cx">
</span><ins>+TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
</ins><span class="cx"> This tests the ability to select and replace text with respect to selection.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="lines">@@ -27,6 +29,12 @@
</span><span class="cx"> PASS selection is 'brown'
</span><span class="cx"> PASS result is 'brown'
</span><span class="cx"> PASS selection is 'BROWN'
</span><ins>+PASS result is 'quick'
+PASS windowSelection.getRangeAt(0).startOffset is 11
+PASS windowSelection.getRangeAt(0).endOffset is 16
+PASS result is 'quick'
+PASS windowSelection.getRangeAt(0).startOffset is 56
+PASS windowSelection.getRangeAt(0).endOffset is 61
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/select-text.html (171996 => 171997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-08-04 17:32:21 UTC (rev 171996)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text.html 2014-08-04 17:42:44 UTC (rev 171997)
</span><span class="lines">@@ -6,8 +6,10 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span><del>-<p contenteditable="true" id="text">The quick brown fox <span id="target">jumps</span> over the lazy dog.</p>
</del><ins>+<p contenteditable="true" id="text">The quick brown fox <span id="target">jumps</span> over the lazy dog. </p>
</ins><span class="cx">
</span><ins>+<p contenteditable="true" id="text2">TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.</p>
+
</ins><span class="cx"> <p id="description"></p>
</span><span class="cx"> <div id="console"></div>
</span><span class="cx">
</span><span class="lines">@@ -110,6 +112,37 @@
</span><span class="cx"> selection = selectedText();
</span><span class="cx"> shouldBe("selection", "'BROWN'");
</span><span class="cx">
</span><ins>+ // [https://bugs.webkit.org/show_bug.cgi?id=135546]
+ // A matching range before the selection should be selected when searching for closest match.
+ document.getElementById("text2").focus();
+ var windowSelection = window.getSelection();
+ windowSelection.removeAllRanges();
+
+ // First find the range before the current selection.
+ var range = document.createRange();
+ range.setStart(document.getElementById("text2").firstChild, 20);
+ range.setEnd(document.getElementById("text2").firstChild, 20);
+ windowSelection.addRange(range);
+
+ var text2 = accessibilityController.accessibleElementById("text2");
+ result = text2.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "quick");
+ shouldBe("result", "'quick'");
+ selection = window.getSelection();
+ shouldBe("windowSelection.getRangeAt(0).startOffset", "11");
+ shouldBe("windowSelection.getRangeAt(0).endOffset", "16");
+
+ // Move the cursor closer to the second instance in front of the selection.
+ range = document.createRange();
+ range.setStart(document.getElementById("text2").firstChild, 48);
+ range.setEnd(document.getElementById("text2").firstChild, 48);
+ windowSelection.removeAllRanges();
+ windowSelection.addRange(range);
+
+ result = text2.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "quick");
+ shouldBe("result", "'quick'");
+ shouldBe("windowSelection.getRangeAt(0).startOffset", "56");
+ shouldBe("windowSelection.getRangeAt(0).endOffset", "61");
+
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171996 => 171997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-04 17:32:21 UTC (rev 171996)
+++ trunk/Source/WebCore/ChangeLog 2014-08-04 17:42:44 UTC (rev 171997)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-08-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><ins>+ AX: SelectText functionality always selects text after current selection even if closer selection is behind it
+ https://bugs.webkit.org/show_bug.cgi?id=135546
+
+ Reviewed by Mario Sanchez Prada.
+
+ Logic was incorrect for comparing ranges found before the current selection.
+ ASSERT was incorrect for allowed ranges. We need to allow ranges that are right at the boundaries of our found ranges.
+
+ Extended existing test: platform/mac/accessibility/select-text.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::rangeClosestToRange):
+
+2014-08-04 Chris Fleizach <cfleizach@apple.com>
+
</ins><span class="cx"> AX: AXSelectTextWithCriteriaParameterizedAttribute incorrectly selects the beginning letters of a word
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135547
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (171996 => 171997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-04 17:32:21 UTC (rev 171996)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-04 17:42:44 UTC (rev 171997)
</span><span class="lines">@@ -531,8 +531,8 @@
</span><span class="cx"> static PassRefPtr<Range> rangeClosestToRange(Range* referenceRange, PassRefPtr<Range> afterRange, PassRefPtr<Range> beforeRange)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(referenceRange);
</span><del>- ASSERT(!afterRange || afterRange->startPosition() > referenceRange->startPosition());
- ASSERT(!beforeRange || beforeRange->endPosition() < referenceRange->endPosition());
</del><ins>+ ASSERT(!afterRange || afterRange->startPosition() >= referenceRange->endPosition());
+ ASSERT(!beforeRange || beforeRange->endPosition() <= referenceRange->startPosition());
</ins><span class="cx">
</span><span class="cx"> if (!referenceRange || (!afterRange && !beforeRange))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -541,8 +541,8 @@
</span><span class="cx"> if (!afterRange && beforeRange)
</span><span class="cx"> return beforeRange;
</span><span class="cx">
</span><del>- unsigned positionsToAfterRange = Position::positionCountBetweenPositions(afterRange->startPosition(), referenceRange->startPosition());
- unsigned positionsToBeforeRange = Position::positionCountBetweenPositions(afterRange->endPosition(), referenceRange->endPosition());
</del><ins>+ unsigned positionsToAfterRange = Position::positionCountBetweenPositions(afterRange->startPosition(), referenceRange->endPosition());
+ unsigned positionsToBeforeRange = Position::positionCountBetweenPositions(beforeRange->endPosition(), referenceRange->startPosition());
</ins><span class="cx">
</span><span class="cx"> return positionsToAfterRange < positionsToBeforeRange ? afterRange : beforeRange;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>