<!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>[201012] branches/safari-602.1.32-branch</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/201012">201012</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 01:47:24 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200872">r200872</a>. rdar://problem/25993225</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchLayoutTestsChangeLog">branches/safari-602.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreChangeLog">branches/safari-602.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreaccessibilityAXObjectCachecpp">branches/safari-602.1.32-branch/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602132branchLayoutTestsaccessibilitymaccharacteroffsetfromupstreampositionexpectedtxt">branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position-expected.txt</a></li>
<li><a href="#branchessafari602132branchLayoutTestsaccessibilitymaccharacteroffsetfromupstreampositionhtml">branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/LayoutTests/ChangeLog (201011 => 201012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-17 08:47:21 UTC (rev 201011)
+++ branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-17 08:47:24 UTC (rev 201012)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200872. rdar://problem/25993225
+
+ 2016-05-13 Nan Wang <n_wang@apple.com>
+
+ AX: Wrong CharacterOffset from an upstream VisiblePosition
+ https://bugs.webkit.org/show_bug.cgi?id=157644
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/character-offset-from-upstream-position-expected.txt: Added.
+ * accessibility/mac/character-offset-from-upstream-position.html: Added.
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200688. rdar://problem/26013966
</span><span class="cx">
</span><span class="cx"> 2016-05-11 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchLayoutTestsaccessibilitymaccharacteroffsetfromupstreampositionexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position-expected.txt (0 => 201012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position-expected.txt (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position-expected.txt 2016-05-17 08:47:24 UTC (rev 201012)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Lorem ipsum vivamus nibh urna mollis at aliquam taciti, etiam arcu mi semper nostra taciti nulla dolor
+This tests that CharacterOffset that comes from an upstream VisiblePosition is correct.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+First Line: Lorem ipsum vivamus nibh
+Second Line: urna mollis at aliquam taciti,
+[firstEnd, secondStart]: 'space'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari602132branchLayoutTestsaccessibilitymaccharacteroffsetfromupstreampositionhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position.html (0 => 201012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position.html (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/accessibility/mac/character-offset-from-upstream-position.html 2016-05-17 08:47:24 UTC (rev 201012)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<div id="container">
+
+<div id="text" style="width:200px;" contenteditable="true">Lorem ipsum vivamus nibh urna mollis at aliquam taciti, etiam arcu mi semper nostra taciti nulla dolor</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that CharacterOffset that comes from an upstream VisiblePosition is correct.");
+
+ if (window.accessibilityController) {
+
+ var div = accessibilityController.accessibleElementById("text");
+ var text = div.childAtIndex(0);
+ var textRange = text.textMarkerRangeForElement(text);
+
+ var start = text.startTextMarkerForTextMarkerRange(textRange);
+ var firstLine = text.lineTextMarkerRangeForTextMarker(start);
+ var firstEnd = text.endTextMarkerForTextMarkerRange(firstLine);
+ debug("First Line: " + text.stringForTextMarkerRange(firstLine));
+
+ var next = text.nextTextMarker(firstEnd);
+ var secondLine = text.lineTextMarkerRangeForTextMarker(next);
+ var secondStart = text.startTextMarkerForTextMarkerRange(secondLine);
+ debug("Second Line: " + text.stringForTextMarkerRange(secondLine));
+
+ // Here firstEnd should contain a upstream position.
+ // We need to make sure firstEnd does not equal to secondStart after
+ // converting to CharacterOffset.
+ var markerRange = text.textMarkerRangeForMarkers(secondStart, firstEnd);
+ var space = ' ';
+ debug("[firstEnd, secondStart]: " + text.stringForTextMarkerRange(markerRange).replace(space, "'space'"));
+ }
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201011 => 201012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 08:47:21 UTC (rev 201011)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 08:47:24 UTC (rev 201012)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200872. rdar://problem/25993225
+
+ 2016-05-13 Nan Wang <n_wang@apple.com>
+
+ AX: Wrong CharacterOffset from an upstream VisiblePosition
+ https://bugs.webkit.org/show_bug.cgi?id=157644
+
+ Reviewed by Chris Fleizach.
+
+ We should adjust the text marker's CharacterOffset if its corresponding
+ VisiblePosition has upstream affinity.
+
+ Test: accessibility/mac/character-offset-from-upstream-position.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::characterOffsetForTextMarkerData):
+ (WebCore::AXObjectCache::traverseToOffsetInRange):
+ (WebCore::AXObjectCache::localCaretRectForCharacterOffset):
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200866. rdar://problem/26253396
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/accessibility/AXObjectCache.cpp (201011 => 201012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/accessibility/AXObjectCache.cpp 2016-05-17 08:47:21 UTC (rev 201011)
+++ branches/safari-602.1.32-branch/Source/WebCore/accessibility/AXObjectCache.cpp 2016-05-17 08:47:24 UTC (rev 201012)
</span><span class="lines">@@ -71,8 +71,10 @@
</span><span class="cx"> #include "HTMLLabelElement.h"
</span><span class="cx"> #include "HTMLMeterElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "InlineElementBox.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderAttachment.h"
</span><ins>+#include "RenderLineBreak.h"
</ins><span class="cx"> #include "RenderListBox.h"
</span><span class="cx"> #include "RenderMenuList.h"
</span><span class="cx"> #include "RenderMeter.h"
</span><span class="lines">@@ -1468,7 +1470,12 @@
</span><span class="cx"> if (textMarkerData.ignored)
</span><span class="cx"> return CharacterOffset();
</span><span class="cx">
</span><del>- return CharacterOffset(textMarkerData.node, textMarkerData.characterStartIndex, textMarkerData.characterOffset);
</del><ins>+ CharacterOffset result = CharacterOffset(textMarkerData.node, textMarkerData.characterStartIndex, textMarkerData.characterOffset);
+ // When we are at a line wrap and the VisiblePosition is upstream, it means the text marker is at the end of the previous line.
+ // We use the previous CharacterOffset so that it will match the Range.
+ if (textMarkerData.affinity == UPSTREAM)
+ return previousCharacterOffset(result, false);
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CharacterOffset AXObjectCache::traverseToOffsetInRange(RefPtr<Range>range, int offset, TraverseOption option, bool stayWithinRange)
</span><span class="lines">@@ -1601,6 +1608,11 @@
</span><span class="cx"> remaining = offset - cumulativeOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Sometimes when we are getting the end CharacterOffset of a line range, the TextIterator will emit an extra space at the end
+ // and make the character count greater than the Range's end offset.
+ if (toNodeEnd && currentNode->isTextNode() && currentNode == &range->endContainer() && range->endOffset() < lastStartOffset + offsetInCharacter)
+ offsetInCharacter = range->endOffset() - lastStartOffset;
+
</ins><span class="cx"> return CharacterOffset(currentNode, lastStartOffset, offsetInCharacter, remaining);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1999,7 +2011,7 @@
</span><span class="cx">
</span><span class="cx"> // Sometimes when the node is a replaced node and is ignored in accessibility, we get a wrong CharacterOffset from it.
</span><span class="cx"> CharacterOffset result = traverseToOffsetInRange(rangeForNodeContents(obj->node()), characterOffset);
</span><del>- if (result.remainingOffset > 0 && !result.isNull() && isRendererReplacedElement(result.node->renderer()))
</del><ins>+ if (result.remainingOffset > 0 && !result.isNull() && isRendererReplacedElement(result.node->renderer()))
</ins><span class="cx"> result.offset += result.remainingOffset;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -2451,6 +2463,9 @@
</span><span class="cx"> if (inlineBox)
</span><span class="cx"> renderer = &inlineBox->renderer();
</span><span class="cx">
</span><ins>+ if (is<RenderLineBreak>(renderer) && downcast<RenderLineBreak>(renderer)->inlineBoxWrapper() != inlineBox)
+ return IntRect();
+
</ins><span class="cx"> return renderer->localCaretRect(inlineBox, caretOffset);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>