<!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>[201736] 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/201736">201736</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-06 19:40:10 -0700 (Mon, 06 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash inside moveOutOfAllShadowRoots
https://bugs.webkit.org/show_bug.cgi?id=158378
Reviewed by Antti Koivisto.
Source/WebCore:
The bug was caused by InShadowTreeFlag not being cleared when a shadow host or its ancestor was removed
due to addChildNodesToDeletionQueue not invoking notifyChildNodeRemoved when a node was in a shadow tree
but not in a document.
Fixed the bug by invoking notifyChildNodeRemoved when the removed node is either in a shadow tree
or it's in a shadow tree. Also fixed a bug in VTTCue::~VTTCue that it was trying to remove the display
tree even when the owner document was being destroyed. This results in various assertions to be hit.
Test: fast/shadow-dom/shadow-host-removal-crash.html
* dom/ContainerNodeAlgorithms.cpp:
(WebCore::addChildNodesToDeletionQueue):
* html/track/VTTCue.cpp:
(WebCore::VTTCue::~VTTCue):
LayoutTests:
Added a regression test that reproduced the crash reliably at least on my machine.
* fast/shadow-dom/shadow-host-removal-crash-expected.txt: Added.
* fast/shadow-dom/shadow-host-removal-crash.html: Added.
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeAlgorithmscpp">trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCuecpp">trunk/Source/WebCore/html/track/VTTCue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomshadowhostremovalcrashexpectedtxt">trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowhostremovalcrashhtml">trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201735 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-07 02:35:39 UTC (rev 201735)
+++ trunk/LayoutTests/ChangeLog 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-03 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash inside moveOutOfAllShadowRoots
+ https://bugs.webkit.org/show_bug.cgi?id=158378
+
+ Reviewed by Antti Koivisto.
+
+ Added a regression test that reproduced the crash reliably at least on my machine.
+
+ * fast/shadow-dom/shadow-host-removal-crash-expected.txt: Added.
+ * fast/shadow-dom/shadow-host-removal-crash.html: Added.
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2016-06-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement EventListenerOptions argument to addEventListener
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowhostremovalcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash-expected.txt (0 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash-expected.txt 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This tests removing a shadow host while EventHandler holds onto its shadow descendent. WebKit should not hit an assertion or crash. This test requires window.eventSender to run.
+
+foo
+bar
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowhostremovalcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash.html (0 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-host-removal-crash.html 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body onload="runTest();">
+<p>This tests removing a shadow host while EventHandler holds onto its shadow descendent.
+WebKit should not hit an assertion or crash. This test requires window.eventSender to run.</p>
+<div id="log"></div>
+<div id="container"><input><div><span>text</span></div></div>
+<script>
+
+function clickCenter(element) {
+ eventSender.mouseMoveTo(element.offsetLeft + element.offsetWidth / 2, element.offsetTop + element.offsetHeight / 2);
+ eventSender.mouseDown();
+}
+
+function runTest() {
+ testRunner.dumpAsText();
+
+ var container = document.querySelector('#container');
+
+ clickCenter(document.querySelector('#container span'));
+
+ document.getElementById('log').innerHTML = 'foo';
+ eventSender.mouseDown();
+ container.innerHTML = 'bar';
+
+ clickCenter(container);
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (201735 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-06-07 02:35:39 UTC (rev 201735)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -275,6 +275,7 @@
</span><span class="cx">
</span><span class="cx"> # This test relies on EventSender.keydown(), which is not supported on iOS
</span><span class="cx"> webkit.org/b/155233 fast/events/max-tabindex-focus.html [ Skip ]
</span><ins>+fast/shadow-dom/shadow-host-removal-crash.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # The file-wrapper part of <attachment> is not yet working on iOS
</span><span class="cx"> fast/attachment/attachment-type-attribute.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201735 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-07 02:35:39 UTC (rev 201735)
+++ trunk/Source/WebCore/ChangeLog 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-03 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash inside moveOutOfAllShadowRoots
+ https://bugs.webkit.org/show_bug.cgi?id=158378
+
+ Reviewed by Antti Koivisto.
+
+ The bug was caused by InShadowTreeFlag not being cleared when a shadow host or its ancestor was removed
+ due to addChildNodesToDeletionQueue not invoking notifyChildNodeRemoved when a node was in a shadow tree
+ but not in a document.
+
+ Fixed the bug by invoking notifyChildNodeRemoved when the removed node is either in a shadow tree
+ or it's in a shadow tree. Also fixed a bug in VTTCue::~VTTCue that it was trying to remove the display
+ tree even when the owner document was being destroyed. This results in various assertions to be hit.
+
+ Test: fast/shadow-dom/shadow-host-removal-crash.html
+
+ * dom/ContainerNodeAlgorithms.cpp:
+ (WebCore::addChildNodesToDeletionQueue):
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCue::~VTTCue):
+
</ins><span class="cx"> 2016-06-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement EventListenerOptions argument to addEventListener
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeAlgorithmscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp (201735 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2016-06-07 02:35:39 UTC (rev 201735)
+++ trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> Ref<Node> protect(*node); // removedFromDocument may remove remove all references to this node.
</span><span class="cx"> if (Document* containerDocument = container.ownerDocument())
</span><span class="cx"> containerDocument->adoptIfNeeded(node);
</span><del>- if (node->inDocument())
</del><ins>+ if (node->isInTreeScope())
</ins><span class="cx"> notifyChildNodeRemoved(container, *node);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (201735 => 201736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.cpp 2016-06-07 02:35:39 UTC (rev 201735)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2016-06-07 02:40:10 UTC (rev 201736)
</span><span class="lines">@@ -268,10 +268,9 @@
</span><span class="cx">
</span><span class="cx"> VTTCue::~VTTCue()
</span><span class="cx"> {
</span><del>- if (!hasDisplayTree())
- return;
-
- displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
</del><ins>+ // FIXME: We should set m_cue in VTTCueBox to nullptr instead.
+ if (m_displayTree && m_displayTree->document().refCount())
+ m_displayTree->remove(ASSERT_NO_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VTTCue::initialize(ScriptExecutionContext& context)
</span></span></pre>
</div>
</div>
</body>
</html>