<!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>[195457] 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/195457">195457</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-01-22 10:11:51 -0800 (Fri, 22 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: ARIA combo boxes are not returning the right value for selected text range
https://bugs.webkit.org/show_bug.cgi?id=153260
Reviewed by Darin Adler.
Source/WebCore:
Just because an element has an ARIA role doesn't mean we should always use the selected text range of the whole document.
If the element is also a text based ARIA control, we can still use the element's inner text range to return the right value.
Test: accessibility/selected-text-range-aria-elements.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::selectedTextRange):
LayoutTests:
* accessibility/selected-text-range-aria-elements-expected.txt: Added.
* accessibility/selected-text-range-aria-elements.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="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityselectedtextrangeariaelementsexpectedtxt">trunk/LayoutTests/accessibility/selected-text-range-aria-elements-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityselectedtextrangeariaelementshtml">trunk/LayoutTests/accessibility/selected-text-range-aria-elements.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195456 => 195457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-22 18:07:58 UTC (rev 195456)
+++ trunk/LayoutTests/ChangeLog 2016-01-22 18:11:51 UTC (rev 195457)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-22 Chris Fleizach <cfleizach@apple.com>
+
+ AX: ARIA combo boxes are not returning the right value for selected text range
+ https://bugs.webkit.org/show_bug.cgi?id=153260
+
+ Reviewed by Darin Adler.
+
+ * accessibility/selected-text-range-aria-elements-expected.txt: Added.
+ * accessibility/selected-text-range-aria-elements.html: Added.
+
</ins><span class="cx"> 2016-01-21 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Elements with overflow and border-radius don't show in multicolumn properly.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityselectedtextrangeariaelementsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/selected-text-range-aria-elements-expected.txt (0 => 195457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/selected-text-range-aria-elements-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/selected-text-range-aria-elements-expected.txt 2016-01-22 18:11:51 UTC (rev 195457)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+
+This test makes sure that a native text control with a text-like ARIA value returns selectedTextRange
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Text range: {4, 2}
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityselectedtextrangeariaelementshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/selected-text-range-aria-elements.html (0 => 195457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/selected-text-range-aria-elements.html (rev 0)
+++ trunk/LayoutTests/accessibility/selected-text-range-aria-elements.html 2016-01-22 18:11:51 UTC (rev 195457)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+ <input id="combo" type="text" role="combobox" value="Hello World">
+
+ <p id="description"></p>
+ <div id="console"></div>
+
+ <script>
+
+ var node = document.getElementById("combo");
+ node.focus();
+ node.setSelectionRange(4, 6);
+
+ if (window.accessibilityController) {
+ description("This test makes sure that a native text control with a text-like ARIA value returns selectedTextRange");
+
+ var element = accessibilityController.accessibleElementById("combo");
+ debug("Text range: " + element.selectedTextRange);
+ }
+ </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 (195456 => 195457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-22 18:07:58 UTC (rev 195456)
+++ trunk/Source/WebCore/ChangeLog 2016-01-22 18:11:51 UTC (rev 195457)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-22 Chris Fleizach <cfleizach@apple.com>
+
+ AX: ARIA combo boxes are not returning the right value for selected text range
+ https://bugs.webkit.org/show_bug.cgi?id=153260
+
+ Reviewed by Darin Adler.
+
+ Just because an element has an ARIA role doesn't mean we should always use the selected text range of the whole document.
+ If the element is also a text based ARIA control, we can still use the element's inner text range to return the right value.
+
+ Test: accessibility/selected-text-range-aria-elements.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::selectedTextRange):
+
</ins><span class="cx"> 2016-01-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS build fix after r195452.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (195456 => 195457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-01-22 18:07:58 UTC (rev 195456)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-01-22 18:11:51 UTC (rev 195457)
</span><span class="lines">@@ -1493,7 +1493,8 @@
</span><span class="cx"> return PlainTextRange();
</span><span class="cx">
</span><span class="cx"> AccessibilityRole ariaRole = ariaRoleAttribute();
</span><del>- if (isNativeTextControl() && ariaRole == UnknownRole) {
</del><ins>+ // Use the text control native range if it's a native object and it has no ARIA role (or has a text based ARIA role).
+ if (isNativeTextControl() && (ariaRole == UnknownRole || isARIATextControl())) {
</ins><span class="cx"> HTMLTextFormControlElement& textControl = downcast<RenderTextControl>(*m_renderer).textFormControlElement();
</span><span class="cx"> return PlainTextRange(textControl.selectionStart(), textControl.selectionEnd() - textControl.selectionStart());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>