<!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>[210524] 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/210524">210524</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-01-09 14:35:27 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unindenting text inside a blockquote can result in the text being reordered
https://bugs.webkit.org/show_bug.cgi?id=166813
Reviewed by Darin Adler and Ryosuke Niwa.
Test: editing/execCommand/unindent-nested-blockquote-with-inner-div.html
* editing/IndentOutdentCommand.cpp:
(WebCore::IndentOutdentCommand::outdentParagraph):
Start splitting the tree at the beginning of the content being unindented,
not at the containing block flow element, which could e.g. contain other
elements (or even other blockquotes).
* editing/execCommand/unindent-nested-blockquote-with-inner-div-expected.txt: Added.
* editing/execCommand/unindent-nested-blockquote-with-inner-div.html: Added.
Old test output:
second<br><blockquote><div><blockquote>first</blockquote><br></div></blockquote>
New test output:
<blockquote><div><blockquote>first</blockquote><br></div></blockquote>second</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="#trunkSourceWebCoreeditingIndentOutdentCommandcpp">trunk/Source/WebCore/editing/IndentOutdentCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingexecCommandunindentnestedblockquotewithinnerdivexpectedtxt">trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandunindentnestedblockquotewithinnerdivhtml">trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210523 => 210524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-09 22:28:43 UTC (rev 210523)
+++ trunk/LayoutTests/ChangeLog 2017-01-09 22:35:27 UTC (rev 210524)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-09 Tim Horton <timothy_horton@apple.com>
+
+ Unindenting text inside a blockquote can result in the text being reordered
+ https://bugs.webkit.org/show_bug.cgi?id=166813
+
+ Reviewed by Darin Adler and Ryosuke Niwa.
+
+ * editing/execCommand/unindent-nested-blockquote-with-inner-div-expected.txt: Added.
+ * editing/execCommand/unindent-nested-blockquote-with-inner-div.html: Added.
+
+ Old test output:
+ second<br><blockquote><div><blockquote>first</blockquote><br></div></blockquote>
+ New test output:
+ <blockquote><div><blockquote>first</blockquote><br></div></blockquote>second
+
</ins><span class="cx"> 2017-01-09 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Prototype dynamic-import
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandunindentnestedblockquotewithinnerdivexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div-expected.txt (0 => 210524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div-expected.txt 2017-01-09 22:35:27 UTC (rev 210524)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of BLOCKQUOTE > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 0 of BLOCKQUOTE > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldEndEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of BLOCKQUOTE > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 0 of BLOCKQUOTE > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldEndEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of BLOCKQUOTE > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 0 of BLOCKQUOTE > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > B > DIV > BODY > HTML > #document to 6 of #text > B > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > B > DIV > BODY > HTML > #document to 6 of #text > B > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+https://bugs.webkit.org/show_bug.cgi?id=166813 Unindenting text inside a blockquote can result in the text being reordered
+
+before outdent:
+| <blockquote>
+| <div>
+| <blockquote>
+| "first"
+| <br>
+| "second<#selection-caret>"
+| <span>
+| id="select1"
+| <br>
+
+after outdent:
+| <blockquote>
+| <div>
+| <blockquote>
+| "first"
+| <br>
+| "second<#selection-caret>"
+
+before outdent (second inside <div>):
+| <blockquote>
+| <div>
+| <blockquote>
+| "first"
+| <br>
+| <div>
+| "second<#selection-caret>"
+| <span>
+| id="select2"
+| <br>
+
+after outdent:
+| <blockquote>
+| <div>
+| <blockquote>
+| "first"
+| <br>
+| "second<#selection-caret>"
+
+before outdent (second inside <b>):
+| <blockquote>
+| <div>
+| <blockquote>
+| "first"
+| <br>
+| <b>
+| "second<#selection-caret>"
+| <span>
+| id="select3"
+| <br>
+
+after outdent:
+| <blockquote>
+| <div>
+| <blockquote>
+| "first"
+| <br>
+| <b>
+| "second<#selection-caret>"
</ins></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandunindentnestedblockquotewithinnerdivhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div.html (0 => 210524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div.html (rev 0)
+++ trunk/LayoutTests/editing/execCommand/unindent-nested-blockquote-with-inner-div.html 2017-01-09 22:35:27 UTC (rev 210524)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/dump-as-markup.js"></script>
+<script src="../editing.js"></script>
+<script>
+Markup.waitUntilDone()
+
+function editingTest() {
+ Markup.description('https://bugs.webkit.org/show_bug.cgi?id=166813 Unindenting text inside a blockquote can result in the text being reordered');
+
+ document.getElementById("edit1").focus();
+ window.getSelection().setPosition(document.getElementById("select1"), 0);
+ Markup.dump('edit1', 'before outdent');
+ document.execCommand("Outdent");
+ Markup.dump('edit1', 'after outdent');
+
+ document.getElementById("edit2").focus();
+ window.getSelection().setPosition(document.getElementById("select2"), 0);
+ Markup.dump('edit2', 'before outdent (second inside <div>)');
+ document.execCommand("Outdent");
+ Markup.dump('edit2', 'after outdent');
+
+ document.getElementById("edit3").focus();
+ window.getSelection().setPosition(document.getElementById("select3"), 0);
+ Markup.dump('edit3', 'before outdent (second inside <b>)');
+ document.execCommand("Outdent");
+ Markup.dump('edit3', 'after outdent');
+
+ Markup.notifyDone();
+}
+
+
+</script>
+</head>
+<body onload="runEditingTest()">
+<div id="description1">This tests outdenting text adjacent to an inner blockquote, inside a blockquote with an inner div.</div>
+<div id="edit1" contentEditable><blockquote><div><blockquote>first</blockquote><br/>second<span id="select1"></span><br/></div></blockquote></div>
+
+<div id="description2">This tests outdenting text inside a div adjacent to an inner blockquote, inside a blockquote with an inner div.</div>
+<div id="edit2" contentEditable><blockquote><div><blockquote>first</blockquote><br/><div>second<span id="select2"></span><br/></div></div></blockquote></div>
+
+<div id="description3">This tests outdenting text inside an inline adjacent to an inner blockquote, inside a blockquote with an inner div.</div>
+<div id="edit3" contentEditable><blockquote><div><blockquote>first</blockquote><br/><b>second<span id="select3"></span><br/></b></div></blockquote></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210523 => 210524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-09 22:28:43 UTC (rev 210523)
+++ trunk/Source/WebCore/ChangeLog 2017-01-09 22:35:27 UTC (rev 210524)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-09 Tim Horton <timothy_horton@apple.com>
+
+ Unindenting text inside a blockquote can result in the text being reordered
+ https://bugs.webkit.org/show_bug.cgi?id=166813
+
+ Reviewed by Darin Adler and Ryosuke Niwa.
+
+ Test: editing/execCommand/unindent-nested-blockquote-with-inner-div.html
+
+ * editing/IndentOutdentCommand.cpp:
+ (WebCore::IndentOutdentCommand::outdentParagraph):
+ Start splitting the tree at the beginning of the content being unindented,
+ not at the containing block flow element, which could e.g. contain other
+ elements (or even other blockquotes).
+
</ins><span class="cx"> 2017-01-09 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Prototype dynamic-import
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingIndentOutdentCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/IndentOutdentCommand.cpp (210523 => 210524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/IndentOutdentCommand.cpp 2017-01-09 22:28:43 UTC (rev 210523)
+++ trunk/Source/WebCore/editing/IndentOutdentCommand.cpp 2017-01-09 22:35:27 UTC (rev 210524)
</span><span class="lines">@@ -174,10 +174,12 @@
</span><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- auto* enclosingBlockFlow = enclosingBlock(visibleStartOfParagraph.deepEquivalent().deprecatedNode());
</del><ins>+
+ auto* startOfParagraphNode = visibleStartOfParagraph.deepEquivalent().deprecatedNode();
+ auto* enclosingBlockFlow = enclosingBlock(startOfParagraphNode);
</ins><span class="cx"> RefPtr<Node> splitBlockquoteNode = enclosingNode;
</span><span class="cx"> if (enclosingBlockFlow != enclosingNode)
</span><del>- splitBlockquoteNode = splitTreeToNode(enclosingBlockFlow, enclosingNode, true);
</del><ins>+ splitBlockquoteNode = splitTreeToNode(startOfParagraphNode, enclosingNode, true);
</ins><span class="cx"> else {
</span><span class="cx"> // We split the blockquote at where we start outdenting.
</span><span class="cx"> auto* highestInlineNode = highestEnclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), isInline, CannotCrossEditingBoundary, enclosingBlockFlow);
</span></span></pre>
</div>
</div>
</body>
</html>