<!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>[214274] 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/214274">214274</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2017-03-22 13:30:41 -0700 (Wed, 22 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WebKit is returning the wrong rangeForLine
https://bugs.webkit.org/show_bug.cgi?id=169940
Reviewed by Chris Fleizach.
Source/WebCore:
The AXRangeForLine is being calculated using VisiblePostition, so
when we try to use the index we should validate it using VisiblePosition.
Changes are covered in the modified test.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::traverseToOffsetInRange):
(WebCore::AXObjectCache::characterOffsetForIndex):
LayoutTests:
* accessibility/mac/range-for-contenteditable-newline-expected.txt:
* accessibility/mac/range-for-contenteditable-newline.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214273 => 214274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-22 20:30:11 UTC (rev 214273)
+++ trunk/LayoutTests/ChangeLog 2017-03-22 20:30:41 UTC (rev 214274)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-22 Nan Wang <n_wang@apple.com>
+
+ AX: WebKit is returning the wrong rangeForLine
+ https://bugs.webkit.org/show_bug.cgi?id=169940
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/range-for-contenteditable-newline-expected.txt:
+ * accessibility/mac/range-for-contenteditable-newline.html:
+
</ins><span class="cx"> 2017-03-22 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Resource Load Statistics: Fix partitioning bug for client-side cookie access
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacrangeforcontenteditablenewlineexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt (214273 => 214274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt 2017-03-22 20:30:11 UTC (rev 214273)
+++ trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline-expected.txt 2017-03-22 20:30:41 UTC (rev 214274)
</span><span class="lines">@@ -7,6 +7,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def
</span><ins>+The quick brown fox
+
+jumped over the lazy dog
+
+Text in a pre element
+is displayed in a fixed-width
+font
</ins><span class="cx"> This tests that when there are newline characters within text controls, we can get the correct text range from index and length.
</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">@@ -19,6 +26,14 @@
</span><span class="cx"> PASS textareaTextHello is 'hello'
</span><span class="cx"> PASS textareaTextWorld is 'world'
</span><span class="cx"> PASS textDEF is 'def'
</span><ins>+PASS rangeForLine is '{21, 25}'
+PASS textLine is 'jumped over the lazy dog'
+PASS firstLine is 0
+PASS secondLine is 1
+PASS rangeForLine is '{22, 30}'
+PASS textLine is 'is displayed in a fixed-width\n'
+PASS firstLine is 0
+FAIL secondLine should be 1. Was 2.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacrangeforcontenteditablenewlinehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html (214273 => 214274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html 2017-03-22 20:30:11 UTC (rev 214273)
+++ trunk/LayoutTests/accessibility/mac/range-for-contenteditable-newline.html 2017-03-22 20:30:41 UTC (rev 214274)
</span><span class="lines">@@ -12,6 +12,19 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div id="textcontrol2" contenteditable="true">abc<div><br></div<div><br></div><div><br></div><div>def</div></div>
</span><span class="cx">
</span><ins>+<div id="textcontrol3" contenteditable="true">
+<p>The quick brown fox</p>
+<p>jumped over the lazy dog</p>
+</div>
+
+<div id="textcontrol4" contenteditable="true">
+<pre>
+Text in a pre element
+is displayed in a fixed-width
+font
+</pre>
+</div>
+
</ins><span class="cx"> <div role="group" id="console"></div>
</span><span class="cx">
</span><span class="cx"> <script>
</span><span class="lines">@@ -43,6 +56,28 @@
</span><span class="cx"> var textControl2 = accessibilityController.accessibleElementById("textcontrol2");
</span><span class="cx"> var textDEF = textControl2.stringForRange(7, 3);
</span><span class="cx"> shouldBe("textDEF", "'def'");
</span><ins>+
+ // Test line ranges in contenteditable
+ var textControl3 = accessibilityController.accessibleElementById("textcontrol3");
+ var rangeForLine = textControl3.rangeForLine(1);
+ shouldBe("rangeForLine", "'{21, 25}'");
+ var textLine = textControl3.stringForRange(21, 25);
+ shouldBe("textLine", "'jumped over the lazy dog'");
+ var firstLine = textControl3.lineForIndex(20);
+ var secondLine = textControl3.lineForIndex(46);
+ shouldBe("firstLine", "0");
+ shouldBe("secondLine", "1");
+
+ // pre tag in contenteditable
+ var textControl4 = accessibilityController.accessibleElementById("textcontrol4");
+ rangeForLine = textControl4.rangeForLine(1);
+ shouldBe("rangeForLine", "'{22, 30}'");
+ textLine = textControl4.stringForRange(22, 30);
+ shouldBe("textLine", "'is displayed in a fixed-width\\n'");
+ firstLine = textControl4.lineForIndex(21);
+ secondLine = textControl4.lineForIndex(52);
+ shouldBe("firstLine", "0");
+ shouldBe("secondLine", "1");
</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 (214273 => 214274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-22 20:30:11 UTC (rev 214273)
+++ trunk/Source/WebCore/ChangeLog 2017-03-22 20:30:41 UTC (rev 214274)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-22 Nan Wang <n_wang@apple.com>
+
+ AX: WebKit is returning the wrong rangeForLine
+ https://bugs.webkit.org/show_bug.cgi?id=169940
+
+ Reviewed by Chris Fleizach.
+
+ The AXRangeForLine is being calculated using VisiblePostition, so
+ when we try to use the index we should validate it using VisiblePosition.
+
+ Changes are covered in the modified test.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::traverseToOffsetInRange):
+ (WebCore::AXObjectCache::characterOffsetForIndex):
+
</ins><span class="cx"> 2017-03-22 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Resource Load Statistics: Fix partitioning bug for client-side cookie access
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (214273 => 214274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2017-03-22 20:30:11 UTC (rev 214273)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2017-03-22 20:30:41 UTC (rev 214274)
</span><span class="lines">@@ -1621,8 +1621,8 @@
</span><span class="cx"> } else if (Element *shadowHost = currentNode->shadowHost()) {
</span><span class="cx"> // Since we are entering text controls, we should set the currentNode
</span><span class="cx"> // to be the shadow host when there's no content.
</span><del>- if (nodeIsTextControl(shadowHost)) {
- currentNode = currentNode->shadowHost();
</del><ins>+ if (nodeIsTextControl(shadowHost) && currentNode->isShadowRoot()) {
+ currentNode = shadowHost;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> } else if (currentNode != previousNode) {
</span><span class="lines">@@ -2621,11 +2621,28 @@
</span><span class="cx"> if (!obj)
</span><span class="cx"> return CharacterOffset();
</span><span class="cx">
</span><ins>+ VisiblePosition vp = obj->visiblePositionForIndex(index);
+ CharacterOffset validate = characterOffsetFromVisiblePosition(vp);
+ // In text control, VisiblePosition always gives the before position of a
+ // BR node, while CharacterOffset will do the opposite.
+ if (obj->isTextControl() && characterOffsetNodeIsBR(validate))
+ validate.offset = 1;
+
</ins><span class="cx"> RefPtr<Range> range = obj->elementRange();
</span><span class="cx"> CharacterOffset start = startOrEndCharacterOffsetForRange(range, true, true);
</span><span class="cx"> CharacterOffset end = startOrEndCharacterOffsetForRange(range, false, true);
</span><span class="cx"> CharacterOffset result = start;
</span><span class="cx"> for (int i = 0; i < index; i++) {
</span><ins>+ if (result.isEqual(validate)) {
+ // Do not include the new line character, always move the offset to the start of next node.
+ if ((validate.node->isTextNode() || characterOffsetNodeIsBR(validate))) {
+ CharacterOffset next = nextCharacterOffset(validate, false);
+ if (!next.offset && rootAXEditableElement(next.node) == rootAXEditableElement(validate.node))
+ result = next;
+ }
+ break;
+ }
+
</ins><span class="cx"> result = nextCharacterOffset(result, false);
</span><span class="cx"> if (result.isEqual(end))
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>