<!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>[286531] 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/286531">286531</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-04 07:24:46 -0800 (Sat, 04 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix parentNode in CompositeEditCommand::splitTreeToNode
https://bugs.webkit.org/show_bug.cgi?id=230710

Patch by Rob Buis <rbuis@igalia.com> on 2021-12-04
Reviewed by Ryosuke Niwa.

Source/WebCore:

Fix parentNode handling in CompositeEditCommand::splitTreeToNode and
also a few more IndentOutdentCommand methods to support the test case.

Test: editing/execCommand/outdent-cut-crash.html

* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::moveParagraphs):
* editing/IndentOutdentCommand.cpp:
(WebCore::IndentOutdentCommand::indentIntoBlockquote): do not call positionInParentAfterNode
if insertNodeBefore failed.
(WebCore::IndentOutdentCommand::outdentParagraph): need to check for null positions
before calling moveParagraphs.

LayoutTests:

* editing/execCommand/outdent-cut-crash-expected.txt: Added.
* editing/execCommand/outdent-cut-crash.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="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingIndentOutdentCommandcpp">trunk/Source/WebCore/editing/IndentOutdentCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingexecCommandoutdentcutcrashexpectedtxt">trunk/LayoutTests/editing/execCommand/outdent-cut-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandoutdentcutcrashhtml">trunk/LayoutTests/editing/execCommand/outdent-cut-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (286530 => 286531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-04 15:22:57 UTC (rev 286530)
+++ trunk/LayoutTests/ChangeLog 2021-12-04 15:24:46 UTC (rev 286531)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-12-04  Rob Buis  <rbuis@igalia.com>
+
+        Fix parentNode in CompositeEditCommand::splitTreeToNode
+        https://bugs.webkit.org/show_bug.cgi?id=230710
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/execCommand/outdent-cut-crash-expected.txt: Added.
+        * editing/execCommand/outdent-cut-crash.html: Added.
+
</ins><span class="cx"> 2021-12-04  Tyler Wilcock  <tyler_w@apple.com>
</span><span class="cx"> 
</span><span class="cx">         AX: Make ellipsis-text.html, aria-roledescription.html, and aria-switch-checked.html pass in isolated tree mode
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandoutdentcutcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/outdent-cut-crash-expected.txt (0 => 286531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/outdent-cut-crash-expected.txt                             (rev 0)
+++ trunk/LayoutTests/editing/execCommand/outdent-cut-crash-expected.txt        2021-12-04 15:24:46 UTC (rev 286531)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandoutdentcutcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/outdent-cut-crash.html (0 => 286531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/outdent-cut-crash.html                             (rev 0)
+++ trunk/LayoutTests/editing/execCommand/outdent-cut-crash.html        2021-12-04 15:24:46 UTC (rev 286531)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<script>
+if (window.testRunner)
+    window.testRunner.dumpAsText();
+onload = () => {
+    document.designMode = 'on';
+    getSelection().selectAllChildren(input);
+    getSelection().extend(div);
+    queueMicrotask(() => {
+        document.execCommand('Cut');
+    });
+    document.execCommand('Outdent');
+    document.write("Test passes if it does not crash.");
+};
+</script>
+<body>
+  <blockquote>
+    <div>
+      <div>
+        <iframe></iframe>
+      </div>
+      <input id="input"></input>
+    </div>
+  </blockquote>
+  <div id="div"></div>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286530 => 286531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-04 15:22:57 UTC (rev 286530)
+++ trunk/Source/WebCore/ChangeLog      2021-12-04 15:24:46 UTC (rev 286531)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2021-12-04  Rob Buis  <rbuis@igalia.com>
+
+        Fix parentNode in CompositeEditCommand::splitTreeToNode
+        https://bugs.webkit.org/show_bug.cgi?id=230710
+
+        Reviewed by Ryosuke Niwa.
+
+        Fix parentNode handling in CompositeEditCommand::splitTreeToNode and
+        also a few more IndentOutdentCommand methods to support the test case.
+
+        Test: editing/execCommand/outdent-cut-crash.html
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphs):
+        * editing/IndentOutdentCommand.cpp:
+        (WebCore::IndentOutdentCommand::indentIntoBlockquote): do not call positionInParentAfterNode
+        if insertNodeBefore failed.
+        (WebCore::IndentOutdentCommand::outdentParagraph): need to check for null positions
+        before calling moveParagraphs.
+
</ins><span class="cx"> 2021-12-04  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][IFC] Set BoxGeometry for bidi inline boxes
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (286530 => 286531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp    2021-12-04 15:22:57 UTC (rev 286530)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp       2021-12-04 15:24:46 UTC (rev 286531)
</span><span class="lines">@@ -1750,7 +1750,7 @@
</span><span class="cx"> 
</span><span class="cx">     ASSERT(adjustedEnd);
</span><span class="cx">     RefPtr<Node> node;
</span><del>-    for (node = &start; node && node->parentNode() != adjustedEnd; node = node->parentNode()) {
</del><ins>+    for (node = &start; node && node->parentNode() != adjustedEnd;) {
</ins><span class="cx">         RefPtr parentNode = node->parentNode();
</span><span class="cx">         if (!parentNode || !is<Element>(*parentNode) || editingIgnoresContent(*parentNode))
</span><span class="cx">             break;
</span><span class="lines">@@ -1759,6 +1759,7 @@
</span><span class="cx">         VisiblePosition positionInNode = firstPositionInOrBeforeNode(node.get());
</span><span class="cx">         if (positionInParent != positionInNode)
</span><span class="cx">             splitElement(downcast<Element>(*parentNode), *node);
</span><ins>+        node = parentNode;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return node;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingIndentOutdentCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/IndentOutdentCommand.cpp (286530 => 286531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/IndentOutdentCommand.cpp    2021-12-04 15:22:57 UTC (rev 286530)
+++ trunk/Source/WebCore/editing/IndentOutdentCommand.cpp       2021-12-04 15:24:46 UTC (rev 286531)
</span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx">         targetBlockquote = createBlockElement();
</span><span class="cx">         if (outerBlock == nodeToSplitTo)
</span><span class="cx">             insertNodeAt(*targetBlockquote, start);
</span><del>-        else
-            insertNodeBefore(*targetBlockquote, *outerBlock);
</del><ins>+        else if (!insertNodeBefore(*targetBlockquote, *outerBlock))
+            return;
</ins><span class="cx">         startOfContents = positionInParentAfterNode(targetBlockquote.get());
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="lines">@@ -192,8 +192,13 @@
</span><span class="cx">     }
</span><span class="cx">     auto placeholder = HTMLBRElement::create(document());
</span><span class="cx">     insertNodeBefore(placeholder, *splitBlockquoteNode);
</span><del>-    if (placeholder->isConnected())
-        moveParagraph(startOfParagraph(visibleStartOfParagraph), endOfParagraph(visibleEndOfParagraph), positionBeforeNode(placeholder.ptr()), true);
</del><ins>+    if (!placeholder->isConnected())
+        return;
+    auto visibleStartOfParagraphToMove = startOfParagraph(visibleStartOfParagraph);
+    auto visibleEndOfParagraphToMove = endOfParagraph(visibleEndOfParagraph);
+    if (visibleStartOfParagraphToMove.isNull() || visibleEndOfParagraphToMove.isNull())
+        return;
+    moveParagraph(visibleStartOfParagraphToMove, visibleEndOfParagraphToMove, positionBeforeNode(placeholder.ptr()), true);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // FIXME: We should merge this function with ApplyBlockElementCommand::formatSelection
</span></span></pre>
</div>
</div>

</body>
</html>