<!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>[198768] 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/198768">198768</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-03-28 17:42:32 -0700 (Mon, 28 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: iOS: Can't navigate inside ContentEditable fields with voiceover enabled
https://bugs.webkit.org/show_bug.cgi?id=155942
Reviewed by Joanmarie Diggs.
Source/WebCore:
The code to set the selected text range on a non-native text control (like a contenteditable) was either
wrong or broke at some point. It assumed that creating a Position with the contenteditable node with the right
offset would make a valid Position, but it almost never did.
Instead we can use this helper method to create a valid Position.
Test: accessibility/set-selected-text-range-contenteditable.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::setSelectedTextRange):
LayoutTests:
* accessibility/set-selected-text-range-contenteditable-expected.txt: Added.
* accessibility/set-selected-text-range-contenteditable.html: Added.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitysetselectedtextrangecontenteditableexpectedtxt">trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitysetselectedtextrangecontenteditablehtml">trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198767 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-29 00:36:59 UTC (rev 198767)
+++ trunk/LayoutTests/ChangeLog 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-28 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: Can't navigate inside ContentEditable fields with voiceover enabled
+ https://bugs.webkit.org/show_bug.cgi?id=155942
+
+ Reviewed by Joanmarie Diggs.
+
+ * accessibility/set-selected-text-range-contenteditable-expected.txt: Added.
+ * accessibility/set-selected-text-range-contenteditable.html: Added.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+
</ins><span class="cx"> 2016-03-28 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening on 29th Mar.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitysetselectedtextrangecontenteditableexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable-expected.txt (0 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable-expected.txt 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+hello world test
+This tests that selected text ranges can be set on a contenteditable element.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Initial selected range: {1, 0}
+
+Set range: {3, 0}
+PASS content.selectedTextRange became '{3, 0}'
+
+Set range: {100, 0}
+PASS content.selectedTextRange became '{16, 0}'
+
+Set range: {0, 0}
+PASS content.selectedTextRange became '{0, 0}'
+
+Set range: {1, 12}
+PASS content.selectedTextRange became '{1, 12}'
+
+Set range: {-1, 0}
+PASS content.selectedTextRange became '{0, 0}'
+
+Set range: {7, 3}
+PASS content.selectedTextRange became '{7, 3}'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitysetselectedtextrangecontenteditablehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable.html (0 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable.html (rev 0)
+++ trunk/LayoutTests/accessibility/set-selected-text-range-contenteditable.html 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div contenteditable id="content" tabindex="0">hello <b>world</b> test</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that selected text ranges can be set on a contenteditable element.");
+
+
+ if (window.accessibilityController) {
+ window.jsTestIsAsync = true;
+
+ document.getElementById("content").focus();
+ var sel = window.getSelection();
+ var range = document.createRange();
+ range.setStart(sel.anchorNode, 1);
+ range.setEnd(sel.anchorNode, 1);
+ sel.removeAllRanges();
+ sel.addRange(range);
+
+ var content = accessibilityController.accessibleElementById("content");
+ debug("Initial selected range: " + content.selectedTextRange);
+
+ debug("\nSet range: {3, 0}");
+ content.setSelectedTextRange(3, 0);
+ shouldBecomeEqual("content.selectedTextRange", "'{3, 0}'", function() {
+ debug("\nSet range: {100, 0}");
+ content.setSelectedTextRange(100, 0);
+ shouldBecomeEqual("content.selectedTextRange", "'{16, 0}'", function() {
+ debug("\nSet range: {0, 0}");
+ content.setSelectedTextRange(0, 0);
+ shouldBecomeEqual("content.selectedTextRange", "'{0, 0}'", function() {
+ debug("\nSet range: {1, 12}");
+ content.setSelectedTextRange(1, 12);
+ shouldBecomeEqual("content.selectedTextRange", "'{1, 12}'", function() {
+ debug("\nSet range: {-1, 0}");
+ content.setSelectedTextRange(-1, 0);
+ shouldBecomeEqual("content.selectedTextRange", "'{0, 0}'", function() {
+ debug("\nSet range: {7, 3}");
+ content.setSelectedTextRange(7, 3);
+ shouldBecomeEqual("content.selectedTextRange", "'{7, 3}'", finishJSTest);
+ });
+ });
+ });
+ });
+ });
+ }
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (198767 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2016-03-29 00:36:59 UTC (rev 198767)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -2103,6 +2103,7 @@
</span><span class="cx"> webkit.org/b/112014 accessibility/textarea-insertion-point-line-number.html [ Failure ]
</span><span class="cx"> webkit.org/b/112018 accessibility/th-as-title-ui.html [ Failure ]
</span><span class="cx"> webkit.org/b/112021 accessibility/visible-elements.html [ Failure Crash ]
</span><ins>+webkit.org/b/133148 accessibility/set-selected-text-range-contenteditable.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # New accessibility test added in r151079 that is failing for EFL.
</span><span class="cx"> webkit.org/b/117182 accessibility/text-role-with-aria-hidden-inside.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (198767 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-03-29 00:36:59 UTC (rev 198767)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> webkit.org/b/98348 accessibility/radio-button-group-members.html [ Skip ]
</span><span class="cx"> webkit.org/b/141074 accessibility/auto-filled-value.html [ Skip ]
</span><span class="cx"> webkit.org/b/133148 accessibility/content-editable-as-textarea.html [ Skip ]
</span><ins>+webkit.org/b/133148 accessibility/set-selected-text-range-contenteditable.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # Feature disabled, see: https://bugs.webkit.org/show_bug.cgi?id=85425
</span><span class="cx"> webkit.org/b/98925 fast/viewport/viewport-legacy-handheldfriendly.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198767 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-29 00:36:59 UTC (rev 198767)
+++ trunk/Source/WebCore/ChangeLog 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-28 Chris Fleizach <cfleizach@apple.com>
+
+ AX: iOS: Can't navigate inside ContentEditable fields with voiceover enabled
+ https://bugs.webkit.org/show_bug.cgi?id=155942
+
+ Reviewed by Joanmarie Diggs.
+
+ The code to set the selected text range on a non-native text control (like a contenteditable) was either
+ wrong or broke at some point. It assumed that creating a Position with the contenteditable node with the right
+ offset would make a valid Position, but it almost never did.
+
+ Instead we can use this helper method to create a valid Position.
+
+ Test: accessibility/set-selected-text-range-contenteditable.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::setSelectedTextRange):
+
</ins><span class="cx"> 2016-03-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Ninja build on Mac
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (198767 => 198768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-03-29 00:36:59 UTC (rev 198767)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-03-29 00:42:32 UTC (rev 198768)
</span><span class="lines">@@ -1499,18 +1499,17 @@
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::setSelectedTextRange(const PlainTextRange& range)
</span><span class="cx"> {
</span><ins>+ setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
+
</ins><span class="cx"> if (isNativeTextControl()) {
</span><del>- setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
</del><span class="cx"> HTMLTextFormControlElement& textControl = downcast<RenderTextControl>(*m_renderer).textFormControlElement();
</span><span class="cx"> textControl.setSelectionRange(range.start, range.start + range.length);
</span><del>- clearTextSelectionIntent(axObjectCache());
- return;
</del><ins>+ } else {
+ VisiblePosition start = visiblePositionForIndexUsingCharacterIterator(node(), range.start);
+ VisiblePosition end = visiblePositionForIndexUsingCharacterIterator(node(), range.start + range.length);
+ m_renderer->frame().selection().setSelection(VisibleSelection(start, end), FrameSelection::defaultSetSelectionOptions(UserTriggered));
</ins><span class="cx"> }
</span><del>-
- Node* node = m_renderer->node();
- VisibleSelection newSelection(Position(node, range.start, Position::PositionIsOffsetInAnchor), Position(node, range.start + range.length, Position::PositionIsOffsetInAnchor), DOWNSTREAM);
- setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
- m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions());
</del><ins>+
</ins><span class="cx"> clearTextSelectionIntent(axObjectCache());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2848,7 +2847,6 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityRenderObject::canSetValueAttribute() const
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> // In the event of a (Boolean)@readonly and (True/False/Undefined)@aria-readonly
</span><span class="cx"> // value mismatch, the host language native attribute value wins.
</span><span class="cx"> if (isNativeTextControl())
</span></span></pre>
</div>
</div>
</body>
</html>