<!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>[184355] 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/184355">184355</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-14 14:39:50 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
https://bugs.webkit.org/show_bug.cgi?id=119068
Reviewed by Enrica Casucci.
Source/WebCore:
The bug was caused by makeInsertedContentRoundTrippableWithHTMLTreeBuilder not updating
nodes kept tracked by insertedNodes and moveNodeOutOfAncestor stumbling upon it.
Fixed the bug by updating insertedNodes in makeInsertedContentRoundTrippableWithHTMLTreeBuilder.
Test: editing/inserting/insert-table-in-paragraph-crash.html
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::makeInsertedContentRoundTrippableWithHTMLTreeBuilder):
(WebCore::ReplaceSelectionCommand::moveNodeOutOfAncestor):
* editing/ReplaceSelectionCommand.h:
LayoutTests:
Added a test based on https://chromium.googlesource.com/chromium/blink/+/3500267482e60550ce84fadd6c0db883937ce744
* editing/inserting/insert-table-in-paragraph-crash-expected.txt: Added.
* editing/inserting/insert-table-in-paragraph-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="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandh">trunk/Source/WebCore/editing/ReplaceSelectionCommand.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditinginsertinginserttableinparagraphcrashexpectedtxt">trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditinginsertinginserttableinparagraphcrashhtml">trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184354 => 184355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-14 21:32:05 UTC (rev 184354)
+++ trunk/LayoutTests/ChangeLog 2015-05-14 21:39:50 UTC (rev 184355)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
+ https://bugs.webkit.org/show_bug.cgi?id=119068
+
+ Reviewed by Enrica Casucci.
+
+ Added a test based on https://chromium.googlesource.com/chromium/blink/+/3500267482e60550ce84fadd6c0db883937ce744
+
+ * editing/inserting/insert-table-in-paragraph-crash-expected.txt: Added.
+ * editing/inserting/insert-table-in-paragraph-crash.html: Added.
+
</ins><span class="cx"> 2015-05-14 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Expose more font weights for -apple-system
</span></span></pre></div>
<a id="trunkLayoutTestseditinginsertinginserttableinparagraphcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt (0 => 184355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash-expected.txt 2015-05-14 21:39:50 UTC (rev 184355)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+This tests pasting a table element wrapped in p. WebKit should not crash.
+| <table>
+| <tbody>
+| <tr>
+| <td>
+| "stats"
</ins></span></pre></div>
<a id="trunkLayoutTestseditinginsertinginserttableinparagraphcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash.html (0 => 184355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash.html (rev 0)
+++ trunk/LayoutTests/editing/inserting/insert-table-in-paragraph-crash.html 2015-05-14 21:39:50 UTC (rev 184355)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE>
+<html>
+<body>
+<div id="editor" contenteditable="true"></div>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+
+Markup.description('This tests pasting a table element wrapped in p. WebKit should not crash.');
+
+var editor = document.getElementById('editor');
+
+editor.focus();
+document.execCommand('InsertHTML', false, '<p><table><tbody><tr><td>stats</td></tr></tbody></table></p>');
+
+Markup.dump(editor);
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184354 => 184355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-14 21:32:05 UTC (rev 184354)
+++ trunk/Source/WebCore/ChangeLog 2015-05-14 21:39:50 UTC (rev 184355)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
+ https://bugs.webkit.org/show_bug.cgi?id=119068
+
+ Reviewed by Enrica Casucci.
+
+ The bug was caused by makeInsertedContentRoundTrippableWithHTMLTreeBuilder not updating
+ nodes kept tracked by insertedNodes and moveNodeOutOfAncestor stumbling upon it.
+
+ Fixed the bug by updating insertedNodes in makeInsertedContentRoundTrippableWithHTMLTreeBuilder.
+
+ Test: editing/inserting/insert-table-in-paragraph-crash.html
+
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::makeInsertedContentRoundTrippableWithHTMLTreeBuilder):
+ (WebCore::ReplaceSelectionCommand::moveNodeOutOfAncestor):
+ * editing/ReplaceSelectionCommand.h:
+
</ins><span class="cx"> 2015-05-14 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Expose more font weights for -apple-system
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (184354 => 184355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2015-05-14 21:32:05 UTC (rev 184354)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2015-05-14 21:39:50 UTC (rev 184355)
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx"> if (auto* paragraphElement = enclosingElementWithTag(positionInParentBeforeNode(node.get()), pTag)) {
</span><span class="cx"> auto* parent = paragraphElement->parentNode();
</span><span class="cx"> if (parent && parent->hasEditableStyle())
</span><del>- moveNodeOutOfAncestor(node, paragraphElement);
</del><ins>+ moveNodeOutOfAncestor(node, paragraphElement, insertedNodes);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> auto* headerElement = highestEnclosingNodeOfType(positionInParentBeforeNode(node.get()), isHeaderElement);
</span><span class="cx"> if (headerElement) {
</span><span class="cx"> if (headerElement->parentNode() && headerElement->parentNode()->isContentRichlyEditable())
</span><del>- moveNodeOutOfAncestor(node, headerElement);
</del><ins>+ moveNodeOutOfAncestor(node, headerElement, insertedNodes);
</ins><span class="cx"> else {
</span><span class="cx"> HTMLElement* newSpanElement = replaceElementWithSpanPreservingChildrenAndAttributes(downcast<HTMLElement>(node.get()));
</span><span class="cx"> insertedNodes.didReplaceNode(node.get(), newSpanElement);
</span><span class="lines">@@ -653,7 +653,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ReplaceSelectionCommand::moveNodeOutOfAncestor(PassRefPtr<Node> prpNode, PassRefPtr<Node> prpAncestor)
</del><ins>+void ReplaceSelectionCommand::moveNodeOutOfAncestor(PassRefPtr<Node> prpNode, PassRefPtr<Node> prpAncestor, InsertedNodes& insertedNodes)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Node> node = prpNode;
</span><span class="cx"> RefPtr<Node> ancestor = prpAncestor;
</span><span class="lines">@@ -671,8 +671,10 @@
</span><span class="cx"> removeNode(node);
</span><span class="cx"> insertNodeBefore(node, nodeToSplitTo);
</span><span class="cx"> }
</span><del>- if (!ancestor->firstChild())
</del><ins>+ if (!ancestor->firstChild()) {
+ insertedNodes.willRemoveNode(ancestor.get());
</ins><span class="cx"> removeNode(ancestor.release());
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool hasRenderedText(const Text& text)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.h (184354 => 184355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.h 2015-05-14 21:32:05 UTC (rev 184354)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.h 2015-05-14 21:39:50 UTC (rev 184355)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> void removeRedundantStylesAndKeepStyleSpanInline(InsertedNodes&);
</span><span class="cx"> void makeInsertedContentRoundTrippableWithHTMLTreeBuilder(InsertedNodes&);
</span><del>- void moveNodeOutOfAncestor(PassRefPtr<Node>, PassRefPtr<Node> ancestor);
</del><ins>+ void moveNodeOutOfAncestor(PassRefPtr<Node>, PassRefPtr<Node> ancestor, InsertedNodes&);
</ins><span class="cx"> void handleStyleSpans(InsertedNodes&);
</span><span class="cx"> void handlePasteAsQuotationNode();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>