<!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>[166049] 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/166049">166049</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-03-21 00:31:39 -0700 (Fri, 21 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLFrameOwnerElement should obey the SubframeLoadingDisabler when creating subframes
<rdar://problem/15675780>
Merge Blink <a href="http://trac.webkit.org/projects/webkit/changeset/156744">r156744</a> by Adam Klein.
Source/WebCore:
Test: fast/frames/set-iframe-src-in-pagehide-crash.html
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadSubframe):
LayoutTests:
* fast/frames/set-iframe-src-in-pagehide-crash-expected.txt: Added.
* fast/frames/set-iframe-src-in-pagehide-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="#trunkSourceWebCoreloaderSubframeLoadercpp">trunk/Source/WebCore/loader/SubframeLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastframessetiframesrcinpagehidecrashexpectedtxt">trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastframessetiframesrcinpagehidecrashhtml">trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166048 => 166049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-21 07:25:05 UTC (rev 166048)
+++ trunk/LayoutTests/ChangeLog 2014-03-21 07:31:39 UTC (rev 166049)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-21 Andreas Kling <akling@apple.com>
+
+ HTMLFrameOwnerElement should obey the SubframeLoadingDisabler when creating subframes
+ <rdar://problem/15675780>
+
+ Merge Blink r156744 by Adam Klein.
+
+ * fast/frames/set-iframe-src-in-pagehide-crash-expected.txt: Added.
+ * fast/frames/set-iframe-src-in-pagehide-crash.html: Added.
+
</ins><span class="cx"> 2014-03-20 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add frontend controller and models for replay sessions
</span></span></pre></div>
<a id="trunkLayoutTestsfastframessetiframesrcinpagehidecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash-expected.txt (0 => 166049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash-expected.txt 2014-03-21 07:31:39 UTC (rev 166049)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Setting an iframe's src in a pagehide handler should not create a frame (nor a crash)
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS subframe.contentWindow is null
+did not crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastframessetiframesrcinpagehidecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash.html (0 => 166049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash.html (rev 0)
+++ trunk/LayoutTests/fast/frames/set-iframe-src-in-pagehide-crash.html 2014-03-21 07:31:39 UTC (rev 166049)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<div id=one><iframe></iframe></div>
+<div id=two></div>
+<div id=three></div>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+
+description("Setting an iframe's src in a pagehide handler should not create a frame (nor a crash)");
+
+var div1 = document.getElementById('one');
+var div2 = document.getElementById('two');
+var div3 = document.getElementById('three');
+var subframe = document.querySelector('iframe');
+
+subframe.contentWindow.onpagehide = function() {
+ div2.appendChild(div1);
+ subframe.src = 'javascript:void(0)';
+ shouldBeNull("subframe.contentWindow");
+};
+subframe.remove();
+div3.appendChild(subframe);
+subframe.remove();
+debug("did not crash");
+</script>
+<script src="../../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166048 => 166049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-21 07:25:05 UTC (rev 166048)
+++ trunk/Source/WebCore/ChangeLog 2014-03-21 07:31:39 UTC (rev 166049)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-21 Andreas Kling <akling@apple.com>
+
+ HTMLFrameOwnerElement should obey the SubframeLoadingDisabler when creating subframes
+ <rdar://problem/15675780>
+
+ Merge Blink r156744 by Adam Klein.
+
+ Test: fast/frames/set-iframe-src-in-pagehide-crash.html
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::loadSubframe):
+
</ins><span class="cx"> 2014-03-21 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve idiom used for string building in a few places
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (166048 => 166049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-03-21 07:25:05 UTC (rev 166048)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-03-21 07:31:39 UTC (rev 166049)
</span><span class="lines">@@ -354,6 +354,9 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!SubframeLoadingDisabler::canLoadFrame(ownerElement))
+ return nullptr;
+
</ins><span class="cx"> String referrerToUse = SecurityPolicy::generateReferrerHeader(ownerElement.document().referrerPolicy(), url, referrer);
</span><span class="cx"> RefPtr<Frame> frame = m_frame.loader().client().createFrame(url, name, &ownerElement, referrerToUse, allowsScrolling, marginWidth, marginHeight);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>