<!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>[212354] 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/212354">212354</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-15 01:57:28 -0800 (Wed, 15 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>An assertion failure inside removeChildren
https://bugs.webkit.org/show_bug.cgi?id=168069
Reviewed by Brent Fulgham.
Source/WebCore:
The bug was caused by notifyRemovePendingSheet executing scripts synchronously where it shouldn't.
Removed the call to notifyRemovePendingSheetIfNeeded in notifyChildNodeRemoved. Instead, invoke it
in its call sites when they're safe.
Test: http/tests/security/move-iframe-within-focus-handler-inside-removal.html
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::takeAllChildrenFrom):
(WebCore::ContainerNode::notifyChildInserted):
(WebCore::ContainerNode::removeChild):
(WebCore::ContainerNode::parserRemoveChild):
(WebCore::ContainerNode::replaceAllChildren):
(WebCore::ContainerNode::removeChildren):
* dom/ContainerNodeAlgorithms.cpp:
(WebCore::notifyChildNodeRemoved):
LayoutTests:
* http/tests/security/move-iframe-within-focus-handler-inside-removal-expected.txt: Added.
* http/tests/security/move-iframe-within-focus-handler-inside-removal.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="#trunkSourceWebCoredomContainerNodeAlgorithmscpp">trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritymoveiframewithinfocushandlerinsideremovalexpectedtxt">trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritymoveiframewithinfocushandlerinsideremovalhtml">trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212353 => 212354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-15 08:58:23 UTC (rev 212353)
+++ trunk/LayoutTests/ChangeLog 2017-02-15 09:57:28 UTC (rev 212354)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ An assertion failure inside removeChildren
+ https://bugs.webkit.org/show_bug.cgi?id=168069
+
+ Reviewed by Brent Fulgham.
+
+ * http/tests/security/move-iframe-within-focus-handler-inside-removal-expected.txt: Added.
+ * http/tests/security/move-iframe-within-focus-handler-inside-removal.html: Added.
+
</ins><span class="cx"> 2017-02-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Revalidate URL after events that could trigger navigations
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymoveiframewithinfocushandlerinsideremovalexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal-expected.txt (0 => 212354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal-expected.txt 2017-02-15 09:57:28 UTC (rev 212354)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests moving an iframe inside a focus event handler while removing a node.
+To manually test, open this page on a new window/tab each time. Reloading would not work.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS newGlobal is not oldGlobal
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymoveiframewithinfocushandlerinsideremovalhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal.html (0 => 212354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/move-iframe-within-focus-handler-inside-removal.html 2017-02-15 09:57:28 UTC (rev 212354)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+
+description(`Tests moving an iframe inside a focus event handler while removing a node.<br>
+<strong>To manually test, open this page on a new window/tab each time. Reloading would not work.</strong>`);
+
+const iframe = document.createElement('iframe');
+document.body.appendChild(iframe);
+const doc = iframe.contentDocument;
+
+doc.body.innerHTML = `<a id="target" href="#"></a><div><link rel="stylesheet" href="data:,d"></div>`;
+let target = doc.querySelector('#target');
+const linkParent = doc.querySelector('link').parentNode;
+
+window.movedFrame = doc.createElement('iframe');
+const helperFrame = doc.createElement('iframe');
+doc.body.appendChild(helperFrame);
+
+target.onfocus = () => {
+ linkParent.appendChild(movedFrame);
+ const helperContent = `<svg xmlns="http://www.w3.org/2000/svg"><script>top.check();<\/script></svg>`;
+ helperFrame.src = URL.createObjectURL(new Blob([helperContent], {type: 'text/xml'}));
+};
+
+function check() {
+ window.oldGlobal = movedFrame.contentWindow;
+ doc.body.appendChild(movedFrame);
+ window.newGlobal = movedFrame.contentWindow;
+ shouldNotBe('newGlobal', 'oldGlobal');
+ iframe.remove();
+ finishJSTest();
+}
+
+iframe.contentWindow.location.hash = target.id;
+linkParent.textContent = '';
+
+var jsTestIsAsync = true;
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212353 => 212354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-15 08:58:23 UTC (rev 212353)
+++ trunk/Source/WebCore/ChangeLog 2017-02-15 09:57:28 UTC (rev 212354)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-02-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ An assertion failure inside removeChildren
+ https://bugs.webkit.org/show_bug.cgi?id=168069
+
+ Reviewed by Brent Fulgham.
+
+ The bug was caused by notifyRemovePendingSheet executing scripts synchronously where it shouldn't.
+
+ Removed the call to notifyRemovePendingSheetIfNeeded in notifyChildNodeRemoved. Instead, invoke it
+ in its call sites when they're safe.
+
+ Test: http/tests/security/move-iframe-within-focus-handler-inside-removal.html
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::takeAllChildrenFrom):
+ (WebCore::ContainerNode::notifyChildInserted):
+ (WebCore::ContainerNode::removeChild):
+ (WebCore::ContainerNode::parserRemoveChild):
+ (WebCore::ContainerNode::replaceAllChildren):
+ (WebCore::ContainerNode::removeChildren):
+ * dom/ContainerNodeAlgorithms.cpp:
+ (WebCore::notifyChildNodeRemoved):
+
</ins><span class="cx"> 2017-02-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Several tests are timing out after r212349
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (212353 => 212354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2017-02-15 08:58:23 UTC (rev 212353)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2017-02-15 09:57:28 UTC (rev 212354)
</span><span class="lines">@@ -145,6 +145,8 @@
</span><span class="cx"> childrenChanged(change);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ document().notifyRemovePendingSheetIfNeeded();
+
</ins><span class="cx"> // FIXME: assert that we don't dispatch events here since this container node is still disconnected.
</span><span class="cx"> for (auto& child : children) {
</span><span class="cx"> RELEASE_ASSERT(!child->parentNode() && &child->treeScope() == &treeScope());
</span><span class="lines">@@ -362,6 +364,9 @@
</span><span class="cx">
</span><span class="cx"> childrenChanged(change);
</span><span class="cx">
</span><ins>+ // Some call sites may have deleted child nodes. Calling it earlier results in bugs like webkit.org/b/168069.
+ document().notifyRemovePendingSheetIfNeeded();
+
</ins><span class="cx"> for (auto& target : postInsertionNotificationTargets)
</span><span class="cx"> target->finishedInsertingSubtree();
</span><span class="cx"> }
</span><span class="lines">@@ -549,6 +554,7 @@
</span><span class="cx"> notifyChildRemoved(child, prev, next, ChildChangeSourceAPI);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ document().notifyRemovePendingSheetIfNeeded();
</ins><span class="cx"> rebuildSVGExtensionsElementsIfNecessary();
</span><span class="cx"> dispatchSubtreeModifiedEvent();
</span><span class="cx">
</span><span class="lines">@@ -609,6 +615,7 @@
</span><span class="cx"> removeBetween(prev, next, oldChild);
</span><span class="cx">
</span><span class="cx"> notifyChildRemoved(oldChild, prev, next, ChildChangeSourceParser);
</span><ins>+ document().notifyRemovePendingSheetIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://dom.spec.whatwg.org/#concept-node-replace-all
</span><span class="lines">@@ -702,6 +709,7 @@
</span><span class="cx"> childrenChanged(change);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ document().notifyRemovePendingSheetIfNeeded();
</ins><span class="cx"> rebuildSVGExtensionsElementsIfNecessary();
</span><span class="cx"> dispatchSubtreeModifiedEvent();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeAlgorithmscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp (212353 => 212354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2017-02-15 08:58:23 UTC (rev 212353)
+++ trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2017-02-15 09:57:28 UTC (rev 212354)
</span><span class="lines">@@ -159,7 +159,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> notifyNodeRemovedFromDocument(insertionPoint, child);
</span><del>- child.document().notifyRemovePendingSheetIfNeeded();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void addChildNodesToDeletionQueue(Node*& head, Node*& tail, ContainerNode& container)
</span></span></pre>
</div>
</div>
</body>
</html>