<!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>[165139] branches/safari-537.75-branch</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/165139">165139</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 16:11:39 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/164204">r164204</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCorehtmlHTMLFrameOwnerElementh">branches/safari-537.75-branch/Source/WebCore/html/HTMLFrameOwnerElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsfastframesreattachinunloadexpectedtxt">branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload-expected.txt</a></li>
<li><a href="#branchessafari53775branchLayoutTestsfastframesreattachinunloadhtml">branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (165138 => 165139)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 00:05:55 UTC (rev 165138)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 00:11:39 UTC (rev 165139)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r164204.
+
+ 2014-02-16 Andreas Kling <akling@apple.com>
+
+ Ensure that removing an iframe from the DOM tree disconnects its Frame.
+ <https://webkit.org/b/128889>
+ <rdar://problem/15671221>
+
+ Merged from Blink (patch by Adam Klein):
+ https://src.chromium.org/viewvc/blink?revision=156174&view=revision
+
+ * fast/frames/reattach-in-unload-expected.txt: Added.
+ * fast/frames/reattach-in-unload.html: Added.
+
+2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r158697.
</span><span class="cx">
</span><span class="cx"> 2013-11-05 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastframesreattachinunloadexpectedtxtfromrev164204trunkLayoutTestsfastframesreattachinunloadexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload-expected.txt (from rev 164204, trunk/LayoutTests/fast/frames/reattach-in-unload-expected.txt) (0 => 165139)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload-expected.txt (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload-expected.txt 2014-03-06 00:11:39 UTC (rev 165139)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Ensure that removing an iframe from the tree results in frame destruction
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS frame.contentWindow is null
+PASS frame.contentWindow is null
+Did not crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfastframesreattachinunloadhtmlfromrev164204trunkLayoutTestsfastframesreattachinunloadhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload.html (from rev 164204, trunk/LayoutTests/fast/frames/reattach-in-unload.html) (0 => 165139)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload.html (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/frames/reattach-in-unload.html 2014-03-06 00:11:39 UTC (rev 165139)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="../../resources/js-test.js"></script>
+<script>
+description('Ensure that removing an iframe from the tree results in frame destruction');
+
+var frame = document.createElement('iframe');
+function handler() {
+ var p = frame.parentNode;
+ p.removeChild(frame);
+ p.appendChild(frame);
+}
+
+document.body.appendChild(frame);
+frame.contentWindow.onunload = handler;
+frame.parentNode.removeChild(frame)
+shouldBeNull("frame.contentWindow");
+
+var div = document.body.appendChild(document.createElement('div'));
+div.appendChild(frame);
+div.removeChild(frame);
+shouldBeNull("frame.contentWindow");
+debug('Did not crash');
+</script>
+</body>
</ins></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165138 => 165139)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 00:05:55 UTC (rev 165138)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 00:11:39 UTC (rev 165139)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r164204.
+
+ 2014-02-16 Andreas Kling <akling@apple.com>
+
+ Ensure that removing an iframe from the DOM tree disconnects its Frame.
+ <https://webkit.org/b/128889>
+ <rdar://problem/15671221>
+
+ Merged from Blink (patch by Adam Klein):
+ https://src.chromium.org/viewvc/blink?revision=156174&view=revision
+
+ SubframeLoadingDisabler wasn't catching the case when an <iframe> was,
+ in its unload handler, removed and re-added to the same parent.
+ Fix this by using a count of SubframeLoadingDisablers that are on the
+ stack for a given root, rather than a simple boolean.
+
+ Test: fast/frames/reattach-in-unload.html
+
+ * html/HTMLFrameOwnerElement.h:
+ (WebCore::SubframeLoadingDisabler::disabledSubtreeRoots):
+
+2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r157957.
</span><span class="cx">
</span><span class="cx"> 2013-10-24 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorehtmlHTMLFrameOwnerElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/html/HTMLFrameOwnerElement.h (165138 => 165139)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/html/HTMLFrameOwnerElement.h 2014-03-06 00:05:55 UTC (rev 165138)
+++ branches/safari-537.75-branch/Source/WebCore/html/HTMLFrameOwnerElement.h 2014-03-06 00:11:39 UTC (rev 165139)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><ins>+#include <wtf/HashCountedSet.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -101,9 +102,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static HashSet<Node*>& disabledSubtreeRoots()
</del><ins>+ static HashCountedSet<Node*>& disabledSubtreeRoots()
</ins><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(HashSet<Node*>, nodes, ());
</del><ins>+ DEFINE_STATIC_LOCAL(HashCountedSet<Node*>, nodes, ());
</ins><span class="cx"> return nodes;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>