<!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>[211252] 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/211252">211252</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-01-26 20:29:16 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Branch-specific fix for a crash seen after merging <a href="http://trac.webkit.org/projects/webkit/changeset/201777">r201777</a>.
<rdar://problem/30209068>
Reviewed by Andy Estes.
Add null checking of the FrameView in Document::destroyRenderTree() before
calling functions on it. This is not necessary in trunk, as the FrameView
is guaranteed to be present there.
FrameView can be missing on the branch, since render trees for page cached documents
are destroyed when leaving the page cache, not when entering it (trunk behavior.)
When leaving the page cache, the FrameView is already detached, hence the bug.
* dom/Document.cpp:
(WebCore::Document::destroyRenderTree):</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 (211251 => 211252)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-27 04:22:29 UTC (rev 211251)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-27 04:29:16 UTC (rev 211252)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-01-26 Andreas Kling <akling@apple.com>
+
+ Branch-specific fix for a crash seen after merging r201777.
+ <rdar://problem/30209068>
+
+ Reviewed by Andy Estes.
+
+ Add null checking of the FrameView in Document::destroyRenderTree() before
+ calling functions on it. This is not necessary in trunk, as the FrameView
+ is guaranteed to be present there.
+
+ FrameView can be missing on the branch, since render trees for page cached documents
+ are destroyed when leaving the page cache, not when entering it (trunk behavior.)
+ When leaving the page cache, the FrameView is already detached, hence the bug.
+
+ * dom/Document.cpp:
+ (WebCore::Document::destroyRenderTree):
+
</ins><span class="cx"> 2017-01-25 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211151. rdar://problem/30171195
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (211251 => 211252)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-01-27 04:22:29 UTC (rev 211251)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-01-27 04:29:16 UTC (rev 211252)
</span><span class="lines">@@ -2219,10 +2219,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasLivingRenderTree());
</span><span class="cx"> ASSERT(m_pageCacheState != InPageCache);
</span><del>- ASSERT(frame()->view());
</del><span class="cx">
</span><del>- FrameView& frameView = *frame()->view();
-
</del><span class="cx"> SetForScope<bool> change(m_renderTreeBeingDestroyed, true);
</span><span class="cx">
</span><span class="cx"> if (this == &topDocument())
</span><span class="lines">@@ -2230,7 +2227,8 @@
</span><span class="cx">
</span><span class="cx"> documentWillBecomeInactive();
</span><span class="cx">
</span><del>- frameView.willDestroyRenderTree();
</del><ins>+ if (auto* frameView = view())
+ frameView->willDestroyRenderTree();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> if (m_fullScreenRenderer)
</span><span class="lines">@@ -2257,7 +2255,8 @@
</span><span class="cx"> m_textAutoSizedNodes.clear();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- frameView.didDestroyRenderTree();
</del><ins>+ if (auto* frameView = view())
+ frameView->didDestroyRenderTree();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::prepareForDestruction()
</span></span></pre>
</div>
</div>
</body>
</html>