<!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>[211491] 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/211491">211491</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 10:12:08 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Incorrect range from index and length in text controls when there are newlines
https://bugs.webkit.org/show_bug.cgi?id=167677
<rdar://problem/30300099>
Reviewed by Chris Fleizach.
Source/WebCore:
When there are newlines in text controls, the VisiblePosition that is created
from the index could be wrong. Because the index doesn't include the information
regarding a position's affinity. Fixed it by using CharacterOffset instead, since
it doesn't require that information.
Test: accessibility/mac/range-for-contenteditable-newline.html
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::traverseToOffsetInRange):
(WebCore::AXObjectCache::nextCharacterOffset):
(WebCore::AXObjectCache::characterOffsetForIndex):
LayoutTests:
* accessibility/mac/range-for-contenteditable-newline-expected.txt: Added.
* accessibility/mac/range-for-contenteditable-newline.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="#trunkLayoutTestsaccessibilitymacrangeforcontenteditablenewlineexpectedtxt">trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacrangeforcontenteditablenewlinehtml">trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211490 => 211491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-01 18:08:57 UTC (rev 211490)
+++ trunk/LayoutTests/ChangeLog 2017-02-01 18:12:08 UTC (rev 211491)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-01 Nan Wang <n_wang@apple.com>
+
+ AX: Incorrect range from index and length in text controls when there are newlines
+ https://bugs.webkit.org/show_bug.cgi?id=167677
+ <rdar://problem/30300099>
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/range-for-contenteditable-newline-expected.txt: Added.
+ * accessibility/mac/range-for-contenteditable-newline.html: Added.
+
</ins><span class="cx"> 2017-02-01 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> ios-simulator TestExpectations gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacrangeforcontenteditablenewlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt (0 => 211491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt 2017-02-01 18:12:08 UTC (rev 211491)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+some
+hello world
+test
+
+abc
+
+
+
+def
+This tests that when there are newline characters within text controls, we can get the correct text range from index and length.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS textSome is 'some'
+PASS textHello is 'hello'
+PASS textWorld is 'world'
+PASS textTest is 'test'
+PASS textareaTextHello is 'hello'
+PASS textareaTextWorld is 'world'
+PASS textDEF is 'def'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacrangeforcontenteditablenewlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html (0 => 211491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html 2017-02-01 18:12:08 UTC (rev 211491)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="content">
+<div id="textcontrol" contenteditable="true">some<div>hello world</div><div>test</div></div>
+<textarea id="textarea" cols='60' rows='8'>hello test
+world</textarea>
+</div>
+<div id="textcontrol2" contenteditable="true">abc<div><br></div<div><br></div><div><br></div><div>def</div></div>
+
+<div role="group" id="console"></div>
+
+<script>
+
+ description("This tests that when there are newline characters within text controls, we can get the correct text range from index and length.");
+
+ // Test contenteditable with newlines.
+ var textControl = accessibilityController.accessibleElementById("textcontrol");
+ var textSome = textControl.stringForRange(0, 4);
+ shouldBe("textSome", "'some'");
+
+ var textHello = textControl.stringForRange(5, 5);
+ shouldBe("textHello", "'hello'");
+
+ var textWorld = textControl.stringForRange(11, 5);
+ shouldBe("textWorld", "'world'");
+
+ var textTest = textControl.stringForRange(17, 4);
+ shouldBe("textTest", "'test'");
+
+ // Test <textarea> with newlines.
+ var textarea = accessibilityController.accessibleElementById("textarea");
+ var textareaTextHello = textarea.stringForRange(0, 5);
+ var textareaTextWorld = textarea.stringForRange(11, 5);
+ shouldBe("textareaTextHello", "'hello'");
+ shouldBe("textareaTextWorld", "'world'");
+
+ // Test multiple <br> in contenteditable
+ var textControl2 = accessibilityController.accessibleElementById("textcontrol2");
+ var textDEF = textControl2.stringForRange(7, 3);
+ shouldBe("textDEF", "'def'");
+
+</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 (211490 => 211491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-01 18:08:57 UTC (rev 211490)
+++ trunk/Source/WebCore/ChangeLog 2017-02-01 18:12:08 UTC (rev 211491)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-01 Nan Wang <n_wang@apple.com>
+
+ AX: Incorrect range from index and length in text controls when there are newlines
+ https://bugs.webkit.org/show_bug.cgi?id=167677
+ <rdar://problem/30300099>
+
+ Reviewed by Chris Fleizach.
+
+ When there are newlines in text controls, the VisiblePosition that is created
+ from the index could be wrong. Because the index doesn't include the information
+ regarding a position's affinity. Fixed it by using CharacterOffset instead, since
+ it doesn't require that information.
+
+ Test: accessibility/mac/range-for-contenteditable-newline.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::traverseToOffsetInRange):
+ (WebCore::AXObjectCache::nextCharacterOffset):
+ (WebCore::AXObjectCache::characterOffsetForIndex):
+
</ins><span class="cx"> 2017-02-01 Timothy Hatcher <timothy@hatcher.name>
</span><span class="cx">
</span><span class="cx"> AXObjectCache is missing two functions at link time when !HAVE(ACCESSIBILITY)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (211490 => 211491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2017-02-01 18:08:57 UTC (rev 211490)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2017-02-01 18:12:08 UTC (rev 211491)
</span><span class="lines">@@ -1564,7 +1564,7 @@
</span><span class="cx"> bool finished = false;
</span><span class="cx"> int lastStartOffset = 0;
</span><span class="cx">
</span><del>- TextIterator iterator(range.get());
</del><ins>+ TextIterator iterator(range.get(), TextIteratorEntersTextControls);
</ins><span class="cx">
</span><span class="cx"> // When the range has zero length, there might be replaced node or brTag that we need to increment the characterOffset.
</span><span class="cx"> if (iterator.atEnd()) {
</span><span class="lines">@@ -1617,6 +1617,11 @@
</span><span class="cx"> if (childNode && childNode->renderer() && childNode->renderer()->isBR()) {
</span><span class="cx"> currentNode = childNode;
</span><span class="cx"> hasReplacedNodeOrBR = true;
</span><ins>+ } else if (currentNode->isShadowRoot()) {
+ // Since we are entering text controls, we should set the currentNode
+ // to be the shadow host when there's no content.
+ currentNode = currentNode->shadowHost();
+ continue;
</ins><span class="cx"> } else if (currentNode != previousNode) {
</span><span class="cx"> // We should set the start offset and length for the current node in case this is the last iteration.
</span><span class="cx"> lastStartOffset = 1;
</span><span class="lines">@@ -2125,9 +2130,11 @@
</span><span class="cx"> CharacterOffset next = characterOffsetForNodeAndOffset(*characterOffset.node, nextOffset);
</span><span class="cx">
</span><span class="cx"> // To be consistent with VisiblePosition, we should consider the case that current node end to next node start counts 1 offset.
</span><del>- bool isReplacedOrBR = isReplacedNodeOrBR(characterOffset.node) || isReplacedNodeOrBR(next.node);
- if (!ignoreNextNodeStart && !next.isNull() && !isReplacedOrBR && next.node != characterOffset.node)
- next = characterOffsetForNodeAndOffset(*next.node, 0, TraverseOptionIncludeStart);
</del><ins>+ if (!ignoreNextNodeStart && !next.isNull() && !isReplacedNodeOrBR(next.node) && next.node != characterOffset.node) {
+ int length = TextIterator::rangeLength(rangeForUnorderedCharacterOffsets(characterOffset, next).get());
+ if (length > nextOffset - characterOffset.offset)
+ next = characterOffsetForNodeAndOffset(*next.node, 0, TraverseOptionIncludeStart);
+ }
</ins><span class="cx">
</span><span class="cx"> return next;
</span><span class="cx"> }
</span><span class="lines">@@ -2608,12 +2615,16 @@
</span><span class="cx"> if (!obj)
</span><span class="cx"> return CharacterOffset();
</span><span class="cx">
</span><del>- // Since this would only work on rendered nodes, using VisiblePosition to create a collapsed
- // range should be fine.
- VisiblePosition vp = obj->visiblePositionForIndex(index);
- RefPtr<Range> range = makeRange(vp, vp);
-
- return startOrEndCharacterOffsetForRange(range, true);
</del><ins>+ RefPtr<Range> range = obj->elementRange();
+ CharacterOffset start = startOrEndCharacterOffsetForRange(range, true);
+ CharacterOffset end = startOrEndCharacterOffsetForRange(range, false);
+ CharacterOffset result = start;
+ for (int i = 0; i < index; i++) {
+ result = nextCharacterOffset(result, false);
+ if (result.isEqual(end))
+ break;
+ }
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int AXObjectCache::indexForCharacterOffset(const CharacterOffset& characterOffset, AccessibilityObject* obj)
</span></span></pre>
</div>
</div>
</body>
</html>