<!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>[186486] 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/186486">186486</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-07-07 18:53:42 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when parent iframe is set to display none and the child frame is mutated the same time.
https://bugs.webkit.org/show_bug.cgi?id=146699
rdar://problem/16207881
Reviewed by Andreas Kling.
When the parent iframe is set to display: none, we destroy the associated renderer (RenderIFrame).
However if the child frame is mutated the same time, during layout we try to access this RenderIFrame
to check whether it needs frame flattening.
This patch checks whether the parent render widget is still valid.
Source/WebCore:
Test: fast/frames/crash-display-none-iframe-during-onbeforeload.html
* page/FrameView.cpp:
(WebCore::FrameView::isInChildFrameWithFrameFlattening): rearrange early returns.
LayoutTests:
* fast/frames/crash-display-none-iframe-during-onbeforeload-expected.txt: Added.
* fast/frames/crash-display-none-iframe-during-onbeforeload.html: Added.
* fast/frames/resources/displaynone-this-during-object-beforeload.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="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastframescrashdisplaynoneiframeduringonbeforeloadexpectedtxt">trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastframescrashdisplaynoneiframeduringonbeforeloadhtml">trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload.html</a></li>
<li><a href="#trunkLayoutTestsfastframesresourcesdisplaynonethisduringobjectbeforeloadhtml">trunk/LayoutTests/fast/frames/resources/displaynone-this-during-object-beforeload.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186485 => 186486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-07 23:54:11 UTC (rev 186485)
+++ trunk/LayoutTests/ChangeLog 2015-07-08 01:53:42 UTC (rev 186486)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-07 Zalan Bujtas <zalan@apple.com>
+
+ Crash when parent iframe is set to display none and the child frame is mutated the same time.
+ https://bugs.webkit.org/show_bug.cgi?id=146699
+ rdar://problem/16207881
+
+ Reviewed by Andreas Kling.
+
+ When the parent iframe is set to display: none, we destroy the associated renderer (RenderIFrame).
+ However if the child frame is mutated the same time, during layout we try to access this RenderIFrame
+ to check whether it needs frame flattening.
+ This patch checks whether the parent render widget is still valid.
+
+ * fast/frames/crash-display-none-iframe-during-onbeforeload-expected.txt: Added.
+ * fast/frames/crash-display-none-iframe-during-onbeforeload.html: Added.
+ * fast/frames/resources/displaynone-this-during-object-beforeload.html: Added.
+
</ins><span class="cx"> 2015-07-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed test skip after r186476.
</span></span></pre></div>
<a id="trunkLayoutTestsfastframescrashdisplaynoneiframeduringonbeforeloadexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload-expected.txt (0 => 186486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload-expected.txt 2015-07-08 01:53:42 UTC (rev 186486)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or assert while loading the iframe.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastframescrashdisplaynoneiframeduringonbeforeloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload.html (0 => 186486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload.html (rev 0)
+++ trunk/LayoutTests/fast/frames/crash-display-none-iframe-during-onbeforeload.html 2015-07-08 01:53:42 UTC (rev 186486)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<html>
+<head>
+<title>This test that we do not crash, when the child frame is set to display:none during a beforeload event while the subtree is being mutated.</title>
+<script>
+ if (window.testRunner && window.internals) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+</script>
+</head>
+<body>
+<div>PASS if no crash or assert while loading the iframe.</div>
+<iframe id=displaynoneme onload='setTimeout("if (window.testRunner) testRunner.notifyDone()", 100);' src='./resources/displaynone-this-during-object-beforeload.html'></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastframesresourcesdisplaynonethisduringobjectbeforeloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/resources/displaynone-this-during-object-beforeload.html (0 => 186486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/resources/displaynone-this-during-object-beforeload.html (rev 0)
+++ trunk/LayoutTests/fast/frames/resources/displaynone-this-during-object-beforeload.html 2015-07-08 01:53:42 UTC (rev 186486)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<script>
+ var count = 0;
+ function handleBeforeLoad() {
+ if (++count != 2)
+ return;
+ var newElement = document.createElement("div");
+ document.body.appendChild(newElement);
+ parent.document.getElementById("displaynoneme").style.display = "none";
+ newElement.offsetWidth;
+ }
+
+ function documentLoaded() {
+ var o = document.createElement("object");
+ o.addEventListener("beforeload", handleBeforeLoad, false);
+ document.body.appendChild(o);
+ }
+</script>
+<body onload="documentLoaded();"></body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186485 => 186486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-07 23:54:11 UTC (rev 186485)
+++ trunk/Source/WebCore/ChangeLog 2015-07-08 01:53:42 UTC (rev 186486)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-07 Zalan Bujtas <zalan@apple.com>
+
+ Crash when parent iframe is set to display none and the child frame is mutated the same time.
+ https://bugs.webkit.org/show_bug.cgi?id=146699
+ rdar://problem/16207881
+
+ Reviewed by Andreas Kling.
+
+ When the parent iframe is set to display: none, we destroy the associated renderer (RenderIFrame).
+ However if the child frame is mutated the same time, during layout we try to access this RenderIFrame
+ to check whether it needs frame flattening.
+ This patch checks whether the parent render widget is still valid.
+
+ Test: fast/frames/crash-display-none-iframe-during-onbeforeload.html
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::isInChildFrameWithFrameFlattening): rearrange early returns.
+
</ins><span class="cx"> 2015-07-06 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: remove seek forward/backward attributes
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (186485 => 186486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-07-07 23:54:11 UTC (rev 186485)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-07-08 01:53:42 UTC (rev 186486)
</span><span class="lines">@@ -3724,21 +3724,25 @@
</span><span class="cx">
</span><span class="cx"> bool FrameView::isInChildFrameWithFrameFlattening() const
</span><span class="cx"> {
</span><del>- if (!parent() || !frame().ownerElement())
</del><ins>+ if (!frameFlatteningEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!parent())
+ return false;
+
+ HTMLFrameOwnerElement* ownerElement = frame().ownerElement();
+ if (!ownerElement)
+ return false;
+
+ if (!ownerElement->renderWidget())
+ return false;
+
</ins><span class="cx"> // Frame flattening applies when the owner element is either in a frameset or
</span><span class="cx"> // an iframe with flattening parameters.
</span><del>- if (is<HTMLIFrameElement>(*frame().ownerElement())) {
- RenderIFrame& iframeRenderer = downcast<RenderIFrame>(*frame().ownerElement()->renderWidget());
- if (iframeRenderer.flattenFrame())
- return true;
- }
</del><ins>+ if (is<HTMLIFrameElement>(*ownerElement))
+ return downcast<RenderIFrame>(*ownerElement->renderWidget()).flattenFrame();
</ins><span class="cx">
</span><del>- if (!frameFlatteningEnabled())
- return false;
-
- if (is<HTMLFrameElement>(*frame().ownerElement()))
</del><ins>+ if (is<HTMLFrameElement>(*ownerElement))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>