<!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>[184563] 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/184563">184563</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 08:48:17 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Select text mechanism returns results outside of text control regions
https://bugs.webkit.org/show_bug.cgi?id=145041
Reviewed by Mario Sanchez Prada.
Source/WebCore:
The behavior of the select text mechanism (inside accessibility) should make sure that results
returned stay within text control elements if the search was initiated inside a text control element.
Test: platform/mac/accessibility/select-text-stays-inside-text-controls.html
* accessibility/AccessibilityObject.cpp:
(WebCore::rangeClosestToRange):
(WebCore::AccessibilityObject::selectText):
LayoutTests:
* platform/mac/accessibility/select-text-stays-inside-text-controls-expected.txt: Added.
* platform/mac/accessibility/select-text-stays-inside-text-controls.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="#trunkLayoutTestsplatformmacaccessibilityselecttextstaysinsidetextcontrolsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselecttextstaysinsidetextcontrolshtml">trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184562 => 184563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-19 15:10:40 UTC (rev 184562)
+++ trunk/LayoutTests/ChangeLog 2015-05-19 15:48:17 UTC (rev 184563)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-14 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Select text mechanism returns results outside of text control regions
+ https://bugs.webkit.org/show_bug.cgi?id=145041
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/select-text-stays-inside-text-controls-expected.txt: Added.
+ * platform/mac/accessibility/select-text-stays-inside-text-controls.html: Added.
+
</ins><span class="cx"> 2015-05-19 Marcos ChavarrÃa Teijeiro <mchavarria@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Gardening 19th May
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttextstaysinsidetextcontrolsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls-expected.txt (0 => 184563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls-expected.txt 2015-05-19 15:48:17 UTC (rev 184563)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+
+ outside text
+This tests that the select text mechanism will not return results outside of a text input control.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS result is 'textfield'
+PASS document.getElementById('textfield').selectionStart is 0
+PASS document.getElementById('textfield').selectionEnd is 9
+PASS result is ''
+PASS document.getElementById('textfield').selectionStart is 0
+PASS document.getElementById('textfield').selectionEnd is 0
+PASS result is 'text area'
+PASS document.getElementById('textarea').selectionStart is 0
+PASS document.getElementById('textarea').selectionEnd is 9
+PASS result is ''
+PASS document.getElementById('textarea').selectionStart is 0
+PASS document.getElementById('textarea').selectionEnd is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselecttextstaysinsidetextcontrolshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls.html (0 => 184563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/select-text-stays-inside-text-controls.html 2015-05-19 15:48:17 UTC (rev 184563)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<input type="text" id="textfield" value="textfield text">
+<br>
+<textarea id="textarea">text area text</textarea>
+outside text
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that the select text mechanism will not return results outside of a text input control.");
+
+ if (window.accessibilityController) {
+ var textfield = accessibilityController.accessibleElementById("textfield");
+ var windowSelection = window.getSelection();
+
+ document.getElementById("textfield").focus();
+ document.getElementById("textfield").setSelectionRange(0, 0);
+
+ // Try to select text inside the text field.
+ result = textfield.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "textfield");
+ shouldBe("result", "'textfield'");
+ shouldBe("document.getElementById('textfield').selectionStart", "0");
+ shouldBe("document.getElementById('textfield').selectionEnd", "9");
+
+ document.getElementById("textfield").setSelectionRange(0, 0);
+
+ // Try to select text outside the focused text field. It should fail.
+ result = textfield.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "outside");
+ shouldBe("result", "''");
+ shouldBe("document.getElementById('textfield').selectionStart", "0");
+ shouldBe("document.getElementById('textfield').selectionEnd", "0");
+
+ // Do the same for text area
+ document.getElementById("textarea").focus();
+ document.getElementById("textarea").setSelectionRange(0, 0);
+
+ var textarea = accessibilityController.accessibleElementById("textarea");
+
+ // Try to select text inside the text field.
+ result = textarea.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "text area");
+ shouldBe("result", "'text area'");
+ shouldBe("document.getElementById('textarea').selectionStart", "0");
+ shouldBe("document.getElementById('textarea').selectionEnd", "9");
+
+ document.getElementById("textarea").setSelectionRange(0, 0);
+
+ // Try to select text outside the focused text field. It should fail.
+ result = textarea.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "outside");
+ shouldBe("result", "''");
+ shouldBe("document.getElementById('textarea').selectionStart", "0");
+ shouldBe("document.getElementById('textarea').selectionEnd", "0");
+ }
+</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 (184562 => 184563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-19 15:10:40 UTC (rev 184562)
+++ trunk/Source/WebCore/ChangeLog 2015-05-19 15:48:17 UTC (rev 184563)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-14 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Select text mechanism returns results outside of text control regions
+ https://bugs.webkit.org/show_bug.cgi?id=145041
+
+ Reviewed by Mario Sanchez Prada.
+
+ The behavior of the select text mechanism (inside accessibility) should make sure that results
+ returned stay within text control elements if the search was initiated inside a text control element.
+
+ Test: platform/mac/accessibility/select-text-stays-inside-text-controls.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::rangeClosestToRange):
+ (WebCore::AccessibilityObject::selectText):
+
</ins><span class="cx"> 2015-05-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark static variables as const when possible
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (184562 => 184563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-05-19 15:10:40 UTC (rev 184562)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-05-19 15:48:17 UTC (rev 184563)
</span><span class="lines">@@ -610,7 +610,15 @@
</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><ins>+
+ // The treeScope for shadow nodes may not be the same scope as another element in a document.
+ // Comparisons may fail in that case, which are expected behavior and should not assert.
+ if (afterRange && ((afterRange->startPosition().anchorNode()->compareDocumentPosition(referenceRange->endPosition().anchorNode()) & Node::DOCUMENT_POSITION_DISCONNECTED) == Node::DOCUMENT_POSITION_DISCONNECTED))
+ return nullptr;
</ins><span class="cx"> ASSERT(!afterRange || afterRange->startPosition() >= referenceRange->endPosition());
</span><ins>+
+ if (beforeRange && ((beforeRange->endPosition().anchorNode()->compareDocumentPosition(referenceRange->startPosition().anchorNode()) & Node::DOCUMENT_POSITION_DISCONNECTED) == Node::DOCUMENT_POSITION_DISCONNECTED))
+ return nullptr;
</ins><span class="cx"> ASSERT(!beforeRange || beforeRange->endPosition() <= referenceRange->startPosition());
</span><span class="cx">
</span><span class="cx"> if (!referenceRange || (!afterRange && !beforeRange))
</span><span class="lines">@@ -710,6 +718,12 @@
</span><span class="cx">
</span><span class="cx"> // Determine which candidate is closest to the selection and perform the activity.
</span><span class="cx"> if (RefPtr<Range> closestStringRange = rangeClosestToRange(selectedStringRange.get(), closestAfterStringRange, closestBeforeStringRange)) {
</span><ins>+ // If the search started within a text control, ensure that the result is inside that element.
+ if (element() && element()->isTextFormControl()) {
+ if (!closestStringRange->startContainer()->isDescendantOrShadowDescendantOf(element()) || !closestStringRange->endContainer()->isDescendantOrShadowDescendantOf(element()))
+ return String();
+ }
+
</ins><span class="cx"> String closestString = closestStringRange->text();
</span><span class="cx"> bool replaceSelection = false;
</span><span class="cx"> if (frame->selection().setSelectedRange(closestStringRange.get(), DOWNSTREAM, true)) {
</span></span></pre>
</div>
</div>
</body>
</html>