<!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>[198806] 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/198806">198806</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-03-29 15:19:40 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: VoiceOver: Navigating Numbered Lists Causes Number to be announced On Each Line of List
https://bugs.webkit.org/show_bug.cgi?id=155984
Reviewed by Chris Fleizach.
Source/WebCore:
We should limit the list marker text only to the first line of that list item.
Test: accessibility/mac/attributed-string-with-listitem-multiple-lines.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::listMarkerTextForNodeAndPosition):
(WebCore::AccessibilityObject::stringForRange):
LayoutTests:
* accessibility/mac/attributed-string-with-listitem-multiple-lines-expected.txt: Added.
* accessibility/mac/attributed-string-with-listitem-multiple-lines.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="#trunkLayoutTestsaccessibilitymacattributedstringwithlistitemmultiplelinesexpectedtxt">trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacattributedstringwithlistitemmultiplelineshtml">trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198805 => 198806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-29 22:17:04 UTC (rev 198805)
+++ trunk/LayoutTests/ChangeLog 2016-03-29 22:19:40 UTC (rev 198806)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-29 Nan Wang <n_wang@apple.com>
+
+ AX: VoiceOver: Navigating Numbered Lists Causes Number to be announced On Each Line of List
+ https://bugs.webkit.org/show_bug.cgi?id=155984
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/attributed-string-with-listitem-multiple-lines-expected.txt: Added.
+ * accessibility/mac/attributed-string-with-listitem-multiple-lines.html: Added.
+
</ins><span class="cx"> 2016-03-29 Antonio Gomes <tonikitoo@webkit.org>
</span><span class="cx">
</span><span class="cx"> Wheel events' latching state is not reset when appropriate
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacattributedstringwithlistitemmultiplelinesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines-expected.txt (0 => 198806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines-expected.txt 2016-03-29 22:19:40 UTC (rev 198806)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+First line
+
+second line
+Long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long
+This tests that when list item has text of multiple lines we only speak the list marker for the first line.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+1. First line
+second line
+2. Long long long long long long long long long long long long long long long long long long long long long long
+long long long long long long long long long long long long long
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacattributedstringwithlistitemmultiplelineshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines.html (0 => 198806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/attributed-string-with-listitem-multiple-lines.html 2016-03-29 22:19:40 UTC (rev 198806)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<script src="../../resources/js-test-pre.js"></script>
+<body id="body" tabindex="0">
+
+<ol>
+<li id="item1"><p>First line</p>second line</li>
+<li id="item2">Long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long</p></li>
+</ol>
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that when list item has text of multiple lines we only speak the list marker for the first line.");
+
+ if (window.accessibilityController) {
+ var listItem1 = accessibilityController.accessibleElementById("item1");
+ var p1 = listItem1.childAtIndex(0);
+ var firstLineRange = p1.textMarkerRangeForElement(p1);
+ debug(p1.stringForTextMarkerRange(firstLineRange));
+
+ // Get second line.
+ var firstLineEnd = p1.endTextMarkerForTextMarkerRange(firstLineRange);
+ var secondLineRange = p1.lineTextMarkerRangeForTextMarker(p1.nextTextMarker(firstLineEnd));
+ debug(p1.stringForTextMarkerRange(secondLineRange));
+
+ // Soft lines.
+ var listItem2 = accessibilityController.accessibleElementById("item2");
+ var item2Range = listItem2.textMarkerRangeForElement(listItem2);
+ var firstLineStart = listItem2.startTextMarkerForTextMarkerRange(item2Range);
+ firstLineRange = listItem2.lineTextMarkerRangeForTextMarker(firstLineStart);
+ debug(listItem2.stringForTextMarkerRange(firstLineRange));
+
+ firstLineEnd = listItem2.endTextMarkerForTextMarkerRange(firstLineRange);
+ secondLineRange = listItem2.lineTextMarkerRangeForTextMarker(listItem2.nextTextMarker(firstLineEnd));
+ debug(listItem2.stringForTextMarkerRange(secondLineRange));
+ }
+
+</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 (198805 => 198806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-29 22:17:04 UTC (rev 198805)
+++ trunk/Source/WebCore/ChangeLog 2016-03-29 22:19:40 UTC (rev 198806)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-29 Nan Wang <n_wang@apple.com>
+
+ AX: VoiceOver: Navigating Numbered Lists Causes Number to be announced On Each Line of List
+ https://bugs.webkit.org/show_bug.cgi?id=155984
+
+ Reviewed by Chris Fleizach.
+
+ We should limit the list marker text only to the first line of that list item.
+
+ Test: accessibility/mac/attributed-string-with-listitem-multiple-lines.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::listMarkerTextForNodeAndPosition):
+ (WebCore::AccessibilityObject::stringForRange):
+
</ins><span class="cx"> 2016-03-29 Antonio Gomes <tonikitoo@webkit.org>
</span><span class="cx">
</span><span class="cx"> Wheel events' latching state is not reset when appropriate
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (198805 => 198806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-03-29 22:17:04 UTC (rev 198805)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-03-29 22:19:40 UTC (rev 198806)
</span><span class="lines">@@ -1264,6 +1264,13 @@
</span><span class="cx"> if (!isStartOfLine(visiblePositionStart))
</span><span class="cx"> return String();
</span><span class="cx">
</span><ins>+ // We should speak the list marker only for the first line.
+ RenderListItem* listItem = renderListItemContainerForNode(node);
+ if (!listItem)
+ return String();
+ if (!inSameLine(visiblePositionStart, firstPositionInNode(&listItem->element())))
+ return String();
+
</ins><span class="cx"> return listMarkerTextForNode(node);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1281,7 +1288,9 @@
</span><span class="cx"> // non-zero length means textual node, zero length means replaced node (AKA "attachments" in AX)
</span><span class="cx"> if (it.text().length()) {
</span><span class="cx"> // Add a textual representation for list marker text.
</span><del>- builder.append(listMarkerTextForNode(it.node()));
</del><ins>+ // Don't add list marker text for new line character.
+ if (it.text().length() != 1 || !isSpaceOrNewline(it.text()[0]))
+ builder.append(listMarkerTextForNodeAndPosition(it.node(), VisiblePosition(range->startPosition())));
</ins><span class="cx"> it.appendTextToStringBuilder(builder);
</span><span class="cx"> } else {
</span><span class="cx"> // locate the node and starting offset for this replaced range
</span></span></pre>
</div>
</div>
</body>
</html>