<!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>[162492] 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/162492">162492</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-21 18:31:45 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assertion failure in Range::nodeWillBeRemoved
https://bugs.webkit.org/show_bug.cgi?id=121694
Patch by László Langó <llango.u-szeged@partner.samsung.com> on 2014-01-21
Reviewed by Ryosuke Niwa.
Source/WebCore:
Based on Blink a change: https://chromium.googlesource.com/chromium/blink/+/407c1d7b2c45974aa614b3f847ffe9e8fce205fa
This patch fix an assertion failure. Range::nodeWillBeRemoved() might
be called with removed node in ContainerNode, when DOMNodeRemovedFromDocument
event handler calls removeChild(), for node being removed.
Test: fast/dom/Range/remove-twice-crash.html
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::willRemoveChild):
* dom/ContainerNode.h:
LayoutTests:
* fast/dom/Range/remove-twice-crash-expected.txt: Added.
* fast/dom/Range/remove-twice-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="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomRangeremovetwicecrashexpectedtxt">trunk/LayoutTests/fast/dom/Range/remove-twice-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomRangeremovetwicecrashhtml">trunk/LayoutTests/fast/dom/Range/remove-twice-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162491 => 162492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-22 02:22:32 UTC (rev 162491)
+++ trunk/LayoutTests/ChangeLog 2014-01-22 02:31:45 UTC (rev 162492)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-21 László Langó <llango.u-szeged@partner.samsung.com>
+
+ Assertion failure in Range::nodeWillBeRemoved
+ https://bugs.webkit.org/show_bug.cgi?id=121694
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/dom/Range/remove-twice-crash-expected.txt: Added.
+ * fast/dom/Range/remove-twice-crash.html: Added.
+
</ins><span class="cx"> 2014-01-21 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Mac: Expose the visible text of a password field to AX
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomRangeremovetwicecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Range/remove-twice-crash-expected.txt (0 => 162492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Range/remove-twice-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/Range/remove-twice-crash-expected.txt 2014-01-22 02:31:45 UTC (rev 162492)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Range::nodeWillBeRemoved() might be called with removed node, when DOMNodeRemovedFromDocument event handler calls removeChild(), for node being removed.
+PASS; NOT CRASHED
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomRangeremovetwicecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Range/remove-twice-crash.html (0 => 162492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Range/remove-twice-crash.html (rev 0)
+++ trunk/LayoutTests/fast/dom/Range/remove-twice-crash.html 2014-01-22 02:31:45 UTC (rev 162492)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<div>
+Range::nodeWillBeRemoved() might be called with removed node, when DOMNodeRemovedFromDocument event handler calls removeChild(), for node being removed.
+</div>
+<div id="mainDiv">
+ <div id="childDiv">foo</div>
+</div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var done = false;
+document.addEventListener("DOMNodeRemovedFromDocument", function () {
+ if (done)
+ return;
+ done = true;
+ var beingRemoved = event.srcElement;
+ beingRemoved.parentNode.removeChild(beingRemoved);
+}, true);
+
+var childDiv = document.getElementById('childDiv')
+
+var range = document.createRange();
+range.selectNode(childDiv);
+
+try {
+ childDiv.parentNode.removeChild(childDiv);
+} catch (e) {
+ // We get 'NotFoundError'.
+}
+
+document.getElementById('mainDiv').outerHTML = 'PASS; NOT CRASHED';
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162491 => 162492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 02:22:32 UTC (rev 162491)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 02:31:45 UTC (rev 162492)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-21 László Langó <llango.u-szeged@partner.samsung.com>
+
+ Assertion failure in Range::nodeWillBeRemoved
+ https://bugs.webkit.org/show_bug.cgi?id=121694
+
+ Reviewed by Ryosuke Niwa.
+
+ Based on Blink a change: https://chromium.googlesource.com/chromium/blink/+/407c1d7b2c45974aa614b3f847ffe9e8fce205fa
+
+ This patch fix an assertion failure. Range::nodeWillBeRemoved() might
+ be called with removed node in ContainerNode, when DOMNodeRemovedFromDocument
+ event handler calls removeChild(), for node being removed.
+
+ Test: fast/dom/Range/remove-twice-crash.html
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::willRemoveChild):
+ * dom/ContainerNode.h:
+
</ins><span class="cx"> 2014-01-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r161580): Some PDFs render outside their <img>
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (162491 => 162492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-01-22 02:22:32 UTC (rev 162491)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-01-22 02:31:45 UTC (rev 162492)
</span><span class="lines">@@ -480,13 +480,17 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void willRemoveChild(Node& child)
</del><ins>+void ContainerNode::willRemoveChild(Node& child)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(child.parentNode());
</span><span class="cx">
</span><span class="cx"> ChildListMutationScope(*child.parentNode()).willRemoveChild(child);
</span><span class="cx"> child.notifyMutationObserversNodeWillDetach();
</span><span class="cx"> dispatchChildRemovalEvents(child);
</span><ins>+
+ if (child.parentNode() != this)
+ return;
+
</ins><span class="cx"> child.document().nodeWillBeRemoved(&child); // e.g. mutation event listener can create a new range.
</span><span class="cx"> if (child.isContainerNode())
</span><span class="cx"> disconnectSubframesIfNeeded(toContainerNode(child), RootAndDescendants);
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (162491 => 162492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2014-01-22 02:22:32 UTC (rev 162491)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2014-01-22 02:31:45 UTC (rev 162492)
</span><span class="lines">@@ -171,6 +171,8 @@
</span><span class="cx">
</span><span class="cx"> bool isContainerNode() const = delete;
</span><span class="cx">
</span><ins>+ void willRemoveChild(Node& child);
+
</ins><span class="cx"> Node* m_firstChild;
</span><span class="cx"> Node* m_lastChild;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>