<!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>[198426] 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/198426">198426</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 10:44:00 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Typing broken on form input field while using VoiceOver
https://bugs.webkit.org/show_bug.cgi?id=155613
Reviewed by Chris Fleizach.
Source/WebCore:
The div element inside the INPUT element gives a collapsed TextMarkerRange which then creates
a collapsed Range. Fixed it by using the parent node to create the Range when the div node has
no children.
Test: accessibility/mac/text-marker-range-for-node-without-children.html
* accessibility/AXObjectCache.cpp:
(WebCore::setRangeStartOrEndWithCharacterOffset):
LayoutTests:
* accessibility/mac/text-marker-range-for-node-without-children-expected.txt: Added.
* accessibility/mac/text-marker-range-for-node-without-children.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="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymactextmarkerrangefornodewithoutchildrenexpectedtxt">trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymactextmarkerrangefornodewithoutchildrenhtml">trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198425 => 198426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-18 16:57:38 UTC (rev 198425)
+++ trunk/LayoutTests/ChangeLog 2016-03-18 17:44:00 UTC (rev 198426)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-18 Nan Wang <n_wang@apple.com>
+
+ AX: Typing broken on form input field while using VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=155613
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/text-marker-range-for-node-without-children-expected.txt: Added.
+ * accessibility/mac/text-marker-range-for-node-without-children.html: Added.
+
</ins><span class="cx"> 2016-03-18 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> crossorigin element resource loading should check HTTP redirection
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymactextmarkerrangefornodewithoutchildrenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children-expected.txt (0 => 198426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children-expected.txt 2016-03-18 17:44:00 UTC (rev 198426)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+a
+b
+This tests that creating TextMarkerRange from nodes that have no children won't collapse to one side.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS textbox.textMarkerRangeLength(textboxRange) == 1 is true
+PASS textbox.accessibilityElementForTextMarker(startMarker).description is 'AXDescription: parent level'
+PASS textbox.accessibilityElementForTextMarker(endMarker).description is 'AXDescription: parent level'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymactextmarkerrangefornodewithoutchildrenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children.html (0 => 198426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/text-marker-range-for-node-without-children.html 2016-03-18 17:44:00 UTC (rev 198426)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<div id="container" aria-label="parent level">
+a <div id="textbox" aria-label="child level" contenteditable="true"></div> b
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that creating TextMarkerRange from nodes that have no children won't collapse to one side.");
+
+ if (window.accessibilityController) {
+ var textbox = accessibilityController.accessibleElementById("textbox");
+ var textboxRange = textbox.textMarkerRangeForElement(textbox);
+ // The range should include the div element.
+ shouldBeTrue("textbox.textMarkerRangeLength(textboxRange) == 1");
+
+ // Make sure the node that associates with the text marker is the parent div element.
+ var startMarker = textbox.startTextMarkerForTextMarkerRange(textboxRange);
+ var endMarker = textbox.endTextMarkerForTextMarkerRange(textboxRange);
+ shouldBe("textbox.accessibilityElementForTextMarker(startMarker).description", "'AXDescription: parent level'");
+ shouldBe("textbox.accessibilityElementForTextMarker(endMarker).description", "'AXDescription: parent level'");
+ }
+</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 (198425 => 198426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-18 16:57:38 UTC (rev 198425)
+++ trunk/Source/WebCore/ChangeLog 2016-03-18 17:44:00 UTC (rev 198426)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-18 Nan Wang <n_wang@apple.com>
+
+ AX: Typing broken on form input field while using VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=155613
+
+ Reviewed by Chris Fleizach.
+
+ The div element inside the INPUT element gives a collapsed TextMarkerRange which then creates
+ a collapsed Range. Fixed it by using the parent node to create the Range when the div node has
+ no children.
+
+ Test: accessibility/mac/text-marker-range-for-node-without-children.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::setRangeStartOrEndWithCharacterOffset):
+
</ins><span class="cx"> 2016-03-18 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Implement AutoFill Available attribute for a text field
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (198425 => 198426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-03-18 16:57:38 UTC (rev 198425)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-03-18 17:44:00 UTC (rev 198426)
</span><span class="lines">@@ -1630,9 +1630,16 @@
</span><span class="cx">
</span><span class="cx"> int offset = characterOffset.startIndex + characterOffset.offset;
</span><span class="cx"> Node* node = characterOffset.node;
</span><del>- if (isReplacedNodeOrBR(node))
- node = resetNodeAndOffsetForReplacedNode(node, offset, characterOffset.offset);
</del><span class="cx">
</span><ins>+ bool replacedNodeOrBR = isReplacedNodeOrBR(node);
+ // For the non text node that has no children, we should create the range with its parent, otherwise the range would be collapsed.
+ // Example: <div contenteditable="true"></div>, we want the range to include the div element.
+ bool noChildren = !replacedNodeOrBR && !node->isTextNode() && !node->hasChildNodes();
+ int characterCount = noChildren ? (isStart ? 0 : 1) : characterOffset.offset;
+
+ if (replacedNodeOrBR || noChildren)
+ node = resetNodeAndOffsetForReplacedNode(node, offset, characterCount);
+
</ins><span class="cx"> if (isStart)
</span><span class="cx"> range->setStart(node, offset, ec);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>