<!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>[185567] 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/185567">185567</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-06-15 15:01:58 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/182215">r182215</a>): Reproducible crash at drawsvg.org due to reentrant layout
https://bugs.webkit.org/show_bug.cgi?id=145964
Reviewed by Simon Fraser.
Source/WebCore:
Test: svg/as-object/mutate-on-load.html
* page/FrameView.cpp:
(WebCore::FrameView::forceLayoutParentViewIfNeeded): Don't do a synchronous layout here,
because it can lead indirectly to unwanted layout reentrancy. Instead schedule a layout.
LayoutTests:
* svg/as-object/mutate-on-load-expected.html: Added.
* svg/as-object/mutate-on-load.html: Added.
* svg/as-object/resources/embedded-mutates-on-load.svg: 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="#trunkLayoutTestssvgasobjectmutateonloadexpectedhtml">trunk/LayoutTests/svg/as-object/mutate-on-load-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgasobjectmutateonloadhtml">trunk/LayoutTests/svg/as-object/mutate-on-load.html</a></li>
<li><a href="#trunkLayoutTestssvgasobjectresourcesembeddedmutatesonloadsvg">trunk/LayoutTests/svg/as-object/resources/embedded-mutates-on-load.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185566 => 185567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-15 21:26:08 UTC (rev 185566)
+++ trunk/LayoutTests/ChangeLog 2015-06-15 22:01:58 UTC (rev 185567)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-15 Darin Adler <darin@apple.com>
+
+ REGRESSION (r182215): Reproducible crash at drawsvg.org due to reentrant layout
+ https://bugs.webkit.org/show_bug.cgi?id=145964
+
+ Reviewed by Simon Fraser.
+
+ * svg/as-object/mutate-on-load-expected.html: Added.
+ * svg/as-object/mutate-on-load.html: Added.
+ * svg/as-object/resources/embedded-mutates-on-load.svg: Added.
+
</ins><span class="cx"> 2015-06-15 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> JIT bug - fails when inspector closed, works when open
</span></span></pre></div>
<a id="trunkLayoutTestssvgasobjectmutateonloadexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/mutate-on-load-expected.html (0 => 185567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/mutate-on-load-expected.html (rev 0)
+++ trunk/LayoutTests/svg/as-object/mutate-on-load-expected.html 2015-06-15 22:01:58 UTC (rev 185567)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<svg viewbox="0 0 66 220" width="66px">
+<rect width="6" height="0" x="0" y="0"/>
+<rect width="54" height="206" x="6" y="20"/>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgasobjectmutateonloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/mutate-on-load.html (0 => 185567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/mutate-on-load.html (rev 0)
+++ trunk/LayoutTests/svg/as-object/mutate-on-load.html 2015-06-15 22:01:58 UTC (rev 185567)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+<embed type="image/svg+xml" width="66px" src="resources/embedded-mutates-on-load.svg"/>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgasobjectresourcesembeddedmutatesonloadsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/as-object/resources/embedded-mutates-on-load.svg (0 => 185567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/as-object/resources/embedded-mutates-on-load.svg (rev 0)
+++ trunk/LayoutTests/svg/as-object/resources/embedded-mutates-on-load.svg 2015-06-15 22:01:58 UTC (rev 185567)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" onload="runTest()" viewBox="0 0 66 220" width="100%" height="100%">
+<script type="text/ecmascript"><![CDATA[
+
+ function runTest() {
+ document.getElementById("a").setAttribute("height", "0");
+ document.getElementById("b").addEventListener("mousewheel",function() {});
+ }
+
+]]></script>
+
+ <rect id="a" width="6" x="0"/>
+ <rect id="b" width="54" height="206" x="6" y="20"/>
+
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185566 => 185567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-15 21:26:08 UTC (rev 185566)
+++ trunk/Source/WebCore/ChangeLog 2015-06-15 22:01:58 UTC (rev 185567)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-15 Darin Adler <darin@apple.com>
+
+ REGRESSION (r182215): Reproducible crash at drawsvg.org due to reentrant layout
+ https://bugs.webkit.org/show_bug.cgi?id=145964
+
+ Reviewed by Simon Fraser.
+
+ Test: svg/as-object/mutate-on-load.html
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::forceLayoutParentViewIfNeeded): Don't do a synchronous layout here,
+ because it can lead indirectly to unwanted layout reentrancy. Instead schedule a layout.
+
</ins><span class="cx"> 2015-06-15 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: Active participating elements can change while being iterated
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (185566 => 185567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-06-15 21:26:08 UTC (rev 185566)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-06-15 22:01:58 UTC (rev 185567)
</span><span class="lines">@@ -1131,13 +1131,9 @@
</span><span class="cx"> // FrameView for a layout. After that the RenderEmbeddedObject (ownerRenderer) carries the
</span><span class="cx"> // correct size, which RenderSVGRoot::computeReplacedLogicalWidth/Height rely on, when laying
</span><span class="cx"> // out for the first time, or when the RenderSVGRoot size has changed dynamically (eg. via <script>).
</span><del>- Ref<FrameView> frameView(ownerRenderer->view().frameView());
</del><span class="cx">
</span><del>- // Mark the owner renderer as needing layout.
</del><span class="cx"> ownerRenderer->setNeedsLayoutAndPrefWidthsRecalc();
</span><del>-
- // Synchronously enter layout, to layout the view containing the host object/embed/iframe.
- frameView->layout();
</del><ins>+ ownerRenderer->view().frameView().scheduleRelayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::layout(bool allowSubtree)
</span></span></pre>
</div>
</div>
</body>
</html>