<!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>[212077] releases/WebKitGTK/webkit-2.14</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/212077">212077</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-09 23:31:41 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211999">r211999</a> - Disconnect shadow children of root when detaching a frame
https://bugs.webkit.org/show_bug.cgi?id=166851
<rdar://problem/29930443>
Reviewed by Andy Estes.
Source/WebCore:
If the root of the tree we are disconnecting has a shadow element, include it in the set of
things to disconnect.
Tests: fast/shadow-dom/shadow-at-root-during-disconnect.html
* dom/ContainerNodeAlgorithms.cpp:
(WebCore::disconnectSubframes):
LayoutTests:
* fast/shadow-dom/resources/start.html: Added.
* fast/shadow-dom/shadow-at-root-during-disconnect-expected.txt: Added.
* fast/shadow-dom/shadow-at-root-during-disconnect.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoredomContainerNodeAlgorithmscpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/ContainerNodeAlgorithms.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastshadowdomresourcesstarthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/resources/start.html</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastshadowdomshadowatrootduringdisconnectexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastshadowdomshadowatrootduringdisconnecthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (212076 => 212077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-02-10 07:12:12 UTC (rev 212076)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-02-10 07:31:41 UTC (rev 212077)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-09 Brent Fulgham <bfulgham@apple.com>
+
+ Disconnect shadow children of root when detaching a frame
+ https://bugs.webkit.org/show_bug.cgi?id=166851
+ <rdar://problem/29930443>
+
+ Reviewed by Andy Estes.
+
+ * fast/shadow-dom/resources/start.html: Added.
+ * fast/shadow-dom/shadow-at-root-during-disconnect-expected.txt: Added.
+ * fast/shadow-dom/shadow-at-root-during-disconnect.html: Added.
+
</ins><span class="cx"> 2016-11-30 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Use 'childOfType' template when retrieving Shadow DOM elements
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastshadowdomresourcesstarthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/resources/start.html (0 => 212077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/resources/start.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/resources/start.html 2017-02-10 07:31:41 UTC (rev 212077)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+STARTING TEST
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastshadowdomshadowatrootduringdisconnectexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect-expected.txt (0 => 212077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect-expected.txt 2017-02-10 07:31:41 UTC (rev 212077)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+ALERT: false
+ALERT: true
+Tests proper tear-down of shadow content.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Passes if the second alert is 'true'.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastshadowdomshadowatrootduringdisconnecthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect.html (0 => 212077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/shadow-dom/shadow-at-root-during-disconnect.html 2017-02-10 07:31:41 UTC (rev 212077)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script>
+description("Tests proper tear-down of shadow content.");
+
+window.jsTestIsAsync = true;
+
+var target;
+var shadow;
+var childFrame;
+
+function runTest() {
+ target = document.body.appendChild(document.createElement("div"));
+ shadow = target.attachShadow({mode: "open"});
+
+ childFrame = shadow.appendChild(document.createElement("iframe"));
+
+ childFrame.onload = () => {
+ childFrame.onload = null;
+
+ childFrame.src = "javascript:alert(window.location.toString().includes('about:blank'))";
+
+ var xml = `
+<svg xmlns="http://www.w3.org/2000/svg">
+<script>
+document.documentElement.appendChild(parent.target);
+</sc` + `ript>
+<text x="10" y="20">PASS</text>
+<script>
+parent.pass();
+</sc` + `ript>
+</svg>`;
+
+ var innerFrame = document.body.appendChild(document.createElement("iframe"));
+ innerFrame.src = URL.createObjectURL(new Blob([xml], {type: "text/xml"}));
+ };
+
+ childFrame.src = "resources/start.html";
+}
+
+function pass() {
+ testPassed("Passes if the second alert is 'true'.");
+ finishJSTest();
+}
+</script>
+</head>
+<body onload="runTest()">
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (212076 => 212077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-10 07:12:12 UTC (rev 212076)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-10 07:31:41 UTC (rev 212077)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-09 Brent Fulgham <bfulgham@apple.com>
+
+ Disconnect shadow children of root when detaching a frame
+ https://bugs.webkit.org/show_bug.cgi?id=166851
+ <rdar://problem/29930443>
+
+ Reviewed by Andy Estes.
+
+ If the root of the tree we are disconnecting has a shadow element, include it in the set of
+ things to disconnect.
+
+ Tests: fast/shadow-dom/shadow-at-root-during-disconnect.html
+
+ * dom/ContainerNodeAlgorithms.cpp:
+ (WebCore::disconnectSubframes):
+
</ins><span class="cx"> 2016-11-30 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Use 'childOfType' template when retrieving Shadow DOM elements
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoredomContainerNodeAlgorithmscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/ContainerNodeAlgorithms.cpp (212076 => 212077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2017-02-10 07:12:12 UTC (rev 212076)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2017-02-10 07:31:41 UTC (rev 212077)
</span><span class="lines">@@ -289,6 +289,9 @@
</span><span class="cx">
</span><span class="cx"> collectFrameOwners(frameOwners, root);
</span><span class="cx">
</span><ins>+ if (auto* shadowRoot = root.shadowRoot())
+ collectFrameOwners(frameOwners, *shadowRoot);
+
</ins><span class="cx"> // Must disable frame loading in the subtree so an unload handler cannot
</span><span class="cx"> // insert more frames and create loaded frames in detached subtrees.
</span><span class="cx"> SubframeLoadingDisabler disabler(root);
</span></span></pre>
</div>
</div>
</body>
</html>