<!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>[201443] 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/201443">201443</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-05-26 18:41:18 -0700 (Thu, 26 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Wrong CharacterOffset from VisiblePosition with composed characters
https://bugs.webkit.org/show_bug.cgi?id=158138
Reviewed by Chris Fleizach.
Source/WebCore:
The conversion logic is not correct when the text node contains composed characters.
We should use VisiblePosition's offset directly for text nodes so we won't mess things up.
Test: accessibility/mac/character-offset-visible-position-conversion-with-emoji.html
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::visiblePositionFromCharacterOffset):
(WebCore::AXObjectCache::characterOffsetFromVisiblePosition):
LayoutTests:
* accessibility/mac/character-offset-visible-position-conversion-with-emoji-expected.txt: Added.
* accessibility/mac/character-offset-visible-position-conversion-with-emoji.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="#trunkLayoutTestsaccessibilitymaccharacteroffsetvisiblepositionconversionwithemojiexpectedtxt">trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymaccharacteroffsetvisiblepositionconversionwithemojihtml">trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201442 => 201443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-27 00:40:09 UTC (rev 201442)
+++ trunk/LayoutTests/ChangeLog 2016-05-27 01:41:18 UTC (rev 201443)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-26 Nan Wang <n_wang@apple.com>
+
+ AX: Wrong CharacterOffset from VisiblePosition with composed characters
+ https://bugs.webkit.org/show_bug.cgi?id=158138
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/character-offset-visible-position-conversion-with-emoji-expected.txt: Added.
+ * accessibility/mac/character-offset-visible-position-conversion-with-emoji.html: Added.
+
</ins><span class="cx"> 2016-05-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> DOM mutation methods fail to re-check validity of node insertion after removing nodes from old parent
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymaccharacteroffsetvisiblepositionconversionwithemojiexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji-expected.txt (0 => 201443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji-expected.txt 2016-05-27 01:41:18 UTC (rev 201443)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Hi 😎
+This tests that CharacterOffset and VisiblePosition convert correctly when there are composed characters.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Hi 😎
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymaccharacteroffsetvisiblepositionconversionwithemojihtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji.html (0 => 201443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/character-offset-visible-position-conversion-with-emoji.html 2016-05-27 01:41:18 UTC (rev 201443)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <head><meta charset="UTF-8"></head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <body id="body" tabindex="0">
+ <div tabindex="0" id="text" contenteditable=true>
+ Hi 😎
+ </div>
+
+ <p id="description"></p>
+ <div id="console"></div>
+
+ <script>
+
+ description("This tests that CharacterOffset and VisiblePosition convert correctly when there are composed characters.");
+
+ var index = 0;
+ if (window.accessibilityController) {
+ accessibilityController.enableEnhancedAccessibility(true);
+ var webArea = accessibilityController.rootElement.childAtIndex(0);
+ webArea.setBoolAttributeValue("AXCaretBrowsingEnabled", true);
+
+ document.getElementById("text").focus();
+ var text = accessibilityController.accessibleElementById("text");
+
+ eventSender.keyDown("rightArrow");
+ eventSender.keyDown("rightArrow");
+ eventSender.keyDown("rightArrow");
+ eventSender.keyDown("rightArrow");
+ var textMarkerRange = text.selectedTextMarkerRange();
+ var elementRange = text.textMarkerRangeForElement(text);
+ var startMarker = text.startTextMarkerForTextMarkerRange(elementRange);
+ var endMarker = text.endTextMarkerForTextMarkerRange(textMarkerRange);
+ debug(text.stringForTextMarkerRange(text.textMarkerRangeForMarkers(endMarker, startMarker)));
+ }
+
+ </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 (201442 => 201443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-27 00:40:09 UTC (rev 201442)
+++ trunk/Source/WebCore/ChangeLog 2016-05-27 01:41:18 UTC (rev 201443)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-26 Nan Wang <n_wang@apple.com>
+
+ AX: Wrong CharacterOffset from VisiblePosition with composed characters
+ https://bugs.webkit.org/show_bug.cgi?id=158138
+
+ Reviewed by Chris Fleizach.
+
+ The conversion logic is not correct when the text node contains composed characters.
+ We should use VisiblePosition's offset directly for text nodes so we won't mess things up.
+
+ Test: accessibility/mac/character-offset-visible-position-conversion-with-emoji.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::visiblePositionFromCharacterOffset):
+ (WebCore::AXObjectCache::characterOffsetFromVisiblePosition):
+
</ins><span class="cx"> 2016-05-26 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Media queries and platform screen modernization and streamlining
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (201442 => 201443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-05-27 00:40:09 UTC (rev 201442)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2016-05-27 01:41:18 UTC (rev 201443)
</span><span class="lines">@@ -1952,21 +1952,10 @@
</span><span class="cx"> if (characterOffset.isNull())
</span><span class="cx"> return VisiblePosition();
</span><span class="cx">
</span><del>- RefPtr<AccessibilityObject> obj = this->getOrCreate(characterOffset.node);
- if (!obj)
- return VisiblePosition();
-
- // nextVisiblePosition means advancing one character. Use this to calculate the character offset.
- VisiblePositionRange vpRange = obj->visiblePositionRange();
- VisiblePosition start = vpRange.start;
-
- // Sometimes vpRange.start will be the previous node's end position and VisiblePosition will count the leading line break as 1 offset.
- int characterCount = start.deepEquivalent().deprecatedNode() == characterOffset.node ? characterOffset.offset : characterOffset.offset + characterOffset.startIndex;
- VisiblePosition result = start;
- for (int i = 0; i < characterCount; i++)
- result = obj->nextVisiblePosition(result);
-
- return result;
</del><ins>+ // Create a collapsed range and use that to form a VisiblePosition, so that the case with
+ // composed characters will be covered.
+ RefPtr<Range> range = rangeForUnorderedCharacterOffsets(characterOffset, characterOffset);
+ return VisiblePosition(range->startPosition());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CharacterOffset AXObjectCache::characterOffsetFromVisiblePosition(const VisiblePosition& visiblePos)
</span><span class="lines">@@ -1978,6 +1967,9 @@
</span><span class="cx"> Node* domNode = deepPos.deprecatedNode();
</span><span class="cx"> ASSERT(domNode);
</span><span class="cx">
</span><ins>+ if (domNode->offsetInCharacters())
+ return CharacterOffset(domNode, 0, deepPos.deprecatedEditingOffset(), 0);
+
</ins><span class="cx"> RefPtr<AccessibilityObject> obj = this->getOrCreate(domNode);
</span><span class="cx"> if (!obj)
</span><span class="cx"> return CharacterOffset();
</span></span></pre>
</div>
</div>
</body>
</html>