<!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>[200787] 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/200787">200787</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-12 12:51:14 -0700 (Thu, 12 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>indexForVisiblePosition should use the root editable element as the scope
https://bugs.webkit.org/show_bug.cgi?id=157611
Reviewed by Darin Adler.
Source/WebCore:
Use the highest editing host instead of the document node as the scope in indexForVisiblePosition
when it's called inside an editable region. This refactoring is necessary to unblock the work to support
undo/redo in VoiceOver after <a href="http://trac.webkit.org/projects/webkit/changeset/199030">r199030</a>.
We have to workaround a bug in indexForVisiblePosition that it could return a slightly higher index than
the expected value because TextIterator emits an extra new line after a block element with a large margin
at the bottom. Unfortunately, fixing this requires a lot of code changes since the rest of the editing
code assumes this behavior and/or happens to cancel it out with some other quirks.
* editing/ApplyBlockElementCommand.cpp:
(WebCore::ApplyBlockElementCommand::doApply):
* editing/htmlediting.cpp:
(WebCore::indexForVisiblePosition):
LayoutTests:
Rebaselined tests with progressions.
* editing/execCommand/crash-indenting-list-item-expected.txt: Now preseves the selection at the beginning of
the editable region instead of moving it to the end.
* editing/execCommand/format-block-multiple-paragraphs-in-pre-expected.txt: Now preserves selection in more test
cases. This test is the one that required the workaround in ApplyBlockElementCommand::doApply. One of the test
cases would regress and clear the selection without it.
* editing/execCommand/indent-pre-list-expected.txt: Now preserves the selection instead of clearing it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandcrashindentinglistitemexpectedtxt">trunk/LayoutTests/editing/execCommand/crash-indenting-list-item-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandformatblockmultipleparagraphsinpreexpectedtxt">trunk/LayoutTests/editing/execCommand/format-block-multiple-paragraphs-in-pre-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandindentprelistexpectedtxt">trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyBlockElementCommandcpp">trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/LayoutTests/ChangeLog 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ indexForVisiblePosition should use the root editable element as the scope
+ https://bugs.webkit.org/show_bug.cgi?id=157611
+
+ Reviewed by Darin Adler.
+
+ Rebaselined tests with progressions.
+
+ * editing/execCommand/crash-indenting-list-item-expected.txt: Now preseves the selection at the beginning of
+ the editable region instead of moving it to the end.
+ * editing/execCommand/format-block-multiple-paragraphs-in-pre-expected.txt: Now preserves selection in more test
+ cases. This test is the one that required the workaround in ApplyBlockElementCommand::doApply. One of the test
+ cases would regress and clear the selection without it.
+ * editing/execCommand/indent-pre-list-expected.txt: Now preserves the selection instead of clearing it.
+
</ins><span class="cx"> 2016-05-12 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Adjust "main content" video heuristic
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandcrashindentinglistitemexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/crash-indenting-list-item-expected.txt (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/crash-indenting-list-item-expected.txt 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/LayoutTests/editing/execCommand/crash-indenting-list-item-expected.txt 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> | <ul>
</span><span class="cx"> | <li>
</span><span class="cx"> | id="foo"
</span><ins>+| <#selection-caret>
</ins><span class="cx"> | "PASSED"
</span><del>-| <#selection-caret>
</del><span class="cx"> | "
</span><span class="cx"> "
</span><span class="cx"> | <script>
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandformatblockmultipleparagraphsinpreexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/format-block-multiple-paragraphs-in-pre-expected.txt (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/format-block-multiple-paragraphs-in-pre-expected.txt 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/LayoutTests/editing/execCommand/format-block-multiple-paragraphs-in-pre-expected.txt 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> | "
</span><span class="cx"> "
</span><span class="cx"> | <h3>
</span><del>-| "hello"
</del><ins>+| "<#selection-anchor>hello"
</ins><span class="cx"> | <br>
</span><span class="cx"> | "
</span><span class="cx"> "
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> | <br>
</span><span class="cx"> | "
</span><span class="cx"> "
</span><del>-| "webkit"
</del><ins>+| "webkit<#selection-focus>"
</ins><span class="cx"> | "
</span><span class="cx"> "
</span><span class="cx">
</span><span class="lines">@@ -65,12 +65,11 @@
</span><span class="cx"> | "hello
</span><span class="cx"> "
</span><span class="cx"> | <h3>
</span><del>-| "
</del><ins>+| "<#selection-anchor>
</ins><span class="cx"> "
</span><span class="cx"> | "world"
</span><span class="cx"> | "
</span><span class="cx"> "
</span><del>-| "webkit"
-| <#selection-caret>
</del><ins>+| "webkit<#selection-focus>"
</ins><span class="cx"> | "
</span><span class="cx"> "
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandindentprelistexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/LayoutTests/editing/execCommand/indent-pre-list-expected.txt 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx"> | <pre>
</span><span class="cx"> | <blockquote>
</span><span class="cx"> | style="margin: 0 0 0 40px; border: none; padding: 0px;"
</span><del>-| "hello"
</del><ins>+| "<#selection-anchor>hello"
</ins><span class="cx"> | <br>
</span><span class="cx"> | "world"
</span><span class="cx"> | <br>
</span><del>-| "webkit"
</del><ins>+| "webkit<#selection-focus>"
</ins><span class="cx"> | "
</span><span class="cx"> "
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/Source/WebCore/ChangeLog 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ indexForVisiblePosition should use the root editable element as the scope
+ https://bugs.webkit.org/show_bug.cgi?id=157611
+
+ Reviewed by Darin Adler.
+
+ Use the highest editing host instead of the document node as the scope in indexForVisiblePosition
+ when it's called inside an editable region. This refactoring is necessary to unblock the work to support
+ undo/redo in VoiceOver after r199030.
+
+ We have to workaround a bug in indexForVisiblePosition that it could return a slightly higher index than
+ the expected value because TextIterator emits an extra new line after a block element with a large margin
+ at the bottom. Unfortunately, fixing this requires a lot of code changes since the rest of the editing
+ code assumes this behavior and/or happens to cancel it out with some other quirks.
+
+ * editing/ApplyBlockElementCommand.cpp:
+ (WebCore::ApplyBlockElementCommand::doApply):
+ * editing/htmlediting.cpp:
+ (WebCore::indexForVisiblePosition):
+
</ins><span class="cx"> 2016-05-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup RenderObject::containingBlock.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyBlockElementCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -97,6 +97,11 @@
</span><span class="cx"> if (startScope == endScope && startIndex >= 0 && startIndex <= endIndex) {
</span><span class="cx"> VisiblePosition start(visiblePositionForIndex(startIndex, startScope.get()));
</span><span class="cx"> VisiblePosition end(visiblePositionForIndex(endIndex, endScope.get()));
</span><ins>+ // Work around the fact indexForVisiblePosition can return a larger index due to TextIterator
+ // using an extra newline to represent a large margin.
+ // FIXME: Add a new TextIteratorBehavior to suppress it.
+ if (start.isNotNull() && end.isNull())
+ end = lastPositionInNode(endScope.get());
</ins><span class="cx"> if (start.isNotNull() && end.isNotNull())
</span><span class="cx"> setEndingSelection(VisibleSelection(start, end, endingSelection().isDirectional()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (200786 => 200787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2016-05-12 19:29:48 UTC (rev 200786)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2016-05-12 19:51:14 UTC (rev 200787)
</span><span class="lines">@@ -1133,17 +1133,21 @@
</span><span class="cx"> if (visiblePosition.isNull())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Position p(visiblePosition.deepEquivalent());
- Document& document = p.anchorNode()->document();
- ShadowRoot* shadowRoot = p.anchorNode()->containingShadowRoot();
</del><ins>+ Position position = visiblePosition.deepEquivalent();
+ auto& document = *position.document();
</ins><span class="cx">
</span><del>- if (shadowRoot)
- scope = shadowRoot;
- else
- scope = document.documentElement();
</del><ins>+ Node* editableRoot = highestEditableRoot(position, AXObjectCache::accessibilityEnabled() ? HasEditableAXRole : ContentIsEditable);
+ if (editableRoot && !document.inDesignMode())
+ scope = downcast<ContainerNode>(editableRoot);
+ else {
+ if (position.containerNode()->isInShadowTree())
+ scope = position.containerNode()->containingShadowRoot();
+ else
+ scope = &document;
+ }
</ins><span class="cx">
</span><del>- RefPtr<Range> range = Range::create(document, firstPositionInNode(scope.get()), p.parentAnchoredEquivalent());
- return TextIterator::rangeLength(range.get(), true);
</del><ins>+ auto range = Range::create(document, firstPositionInNode(scope.get()), position.parentAnchoredEquivalent());
+ return TextIterator::rangeLength(range.ptr(), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Merge these two functions.
</span></span></pre>
</div>
</div>
</body>
</html>