<!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>[211702] branches/safari-603-branch/Source/WebCore</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/211702">211702</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-05 21:50:57 -0800 (Sun, 05 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211455">r211455</a>. rdar://problem/30241193</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomDocumentcpp">branches/safari-603-branch/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211701 => 211702)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-06 05:25:23 UTC (rev 211701)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-06 05:50:57 UTC (rev 211702)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211455. rdar://problem/30241193
+
+ 2017-01-31 Chris Dumez <cdumez@apple.com>
+
+ com.apple.WebKit.WebContent.Development crashed in com.apple.WebCore: WebCore::FrameView::didDestroyRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=167665
+ <rdar://problem/30241193>
+
+ Reviewed by Andreas Kling.
+
+ When destroying a PageCache entry, we would call Document::prepareFromDestruction()
+ which would destroy the render tree and then call FrameView::didDestroyRenderTree().
+ We would sometimes hit the ASSERT(m_widgetsInRenderTree.isEmpty()) assertion in
+ didDestroyRenderTree(). This indicates that there are still RenderWidgets associated
+ with the FrameView even though we claim we already destroyed the render tree.
+
+ The reason for this is that, in the PageCache context, the top document's frame is
+ reused on navigation and may not be associated with a new document that is currently
+ displayed, has a render tree (and possible RenderWidgets). The solution proposed is
+ to stop calling FrameView::didDestroyRenderTree() in Document::prepareFromDestruction()
+ if the frame's document is not |this|. This happens when the document is destroyed
+ while in PageCache. We do not want to mess with the frame / frameview in this case
+ since they are no longer associated to the present document anymore.
+
+ No new tests, already covered by existing tests which currently crash flakily.
+
+ * dom/Document.cpp:
+ (WebCore::Document::destroyRenderTree):
+
+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211656. rdar://problem/30102568
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (211701 => 211702)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-02-06 05:25:23 UTC (rev 211701)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-02-06 05:50:57 UTC (rev 211702)
</span><span class="lines">@@ -2220,6 +2220,9 @@
</span><span class="cx"> ASSERT(hasLivingRenderTree());
</span><span class="cx"> ASSERT(m_pageCacheState != InPageCache);
</span><span class="cx">
</span><ins>+ FrameView* frameView = frame()->document() == this ? frame()->view() : nullptr;
+ ASSERT(frameView || pageCacheState() == InPageCache);
+
</ins><span class="cx"> SetForScope<bool> change(m_renderTreeBeingDestroyed, true);
</span><span class="cx">
</span><span class="cx"> if (this == &topDocument())
</span><span class="lines">@@ -2227,7 +2230,7 @@
</span><span class="cx">
</span><span class="cx"> documentWillBecomeInactive();
</span><span class="cx">
</span><del>- if (auto* frameView = view())
</del><ins>+ if (frameView)
</ins><span class="cx"> frameView->willDestroyRenderTree();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="lines">@@ -2255,7 +2258,7 @@
</span><span class="cx"> m_textAutoSizedNodes.clear();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (auto* frameView = view())
</del><ins>+ if (frameView)
</ins><span class="cx"> frameView->didDestroyRenderTree();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>