<!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>[187233] branches/safari-601.1-branch</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/187233">187233</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 10:19:29 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186677">r186677</a>, which is a follow-up fix to <a href="http://trac.webkit.org/projects/webkit/changeset/186642">r186642</a>.
2015-07-10 Brady Eidson <beidson@apple.com>
ASSERT restoring from page cache as DocumentLoader reattaches to its Frame.
<rdar://problem/21766282> and https://bugs.webkit.org/show_bug.cgi?id=146786
Reviewed by NOBODY (Fixing obvious boneheaded mistake in <a href="http://trac.webkit.org/projects/webkit/changeset/186642">r186642</a>)
No new tests (Covered by existing)
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::attachToFrame): Bail if reattaching to the current Frame,
which happens when restoring from the page cache.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloaderDocumentLoadercpp">branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchessafari6011branch">branches/safari-601.1-branch/</a></li>
<li><a href="#branchessafari6011branchSourceWebCore">branches/safari-601.1-branch/Source/WebCore/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branch"></a>
<div class="propset"><h4>Property changes: branches/safari-601.1-branch</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk:53455,186677,186980,187126,187148,187194
</span><a id="branchessafari6011branchSourceWebCore"></a>
<div class="propset"><h4>Property changes: branches/safari-601.1-branch/Source/WebCore</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/Source/WebCore:186980
</span><span class="cx">/trunk/WebCore:53455
</span><span class="cx"> + /branches/ftlopt/Source/WebCore:170680
</span><span class="cx">/trunk/Source/WebCore:186677,186980
</span><span class="cx">/trunk/WebCore:53455
</span><a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187232 => 187233)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-23 17:04:32 UTC (rev 187232)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-23 17:19:29 UTC (rev 187233)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-23 Alexey Proskuryakov <ap@apple.com>
+
+ Merge r186677, which is a follow-up fix to r186642.
+
+ 2015-07-10 Brady Eidson <beidson@apple.com>
+
+ ASSERT restoring from page cache as DocumentLoader reattaches to its Frame.
+ <rdar://problem/21766282> and https://bugs.webkit.org/show_bug.cgi?id=146786
+
+ Reviewed by NOBODY (Fixing obvious boneheaded mistake in r186642)
+
+ No new tests (Covered by existing)
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::attachToFrame): Bail if reattaching to the current Frame,
+ which happens when restoring from the page cache.
+
</ins><span class="cx"> 2015-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187183.
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp (187232 => 187233)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-07-23 17:04:32 UTC (rev 187232)
+++ branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-07-23 17:19:29 UTC (rev 187233)
</span><span class="lines">@@ -903,6 +903,9 @@
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::attachToFrame(Frame& frame)
</span><span class="cx"> {
</span><ins>+ if (m_frame == &frame)
+ return;
+
</ins><span class="cx"> ASSERT(!m_frame);
</span><span class="cx"> m_frame = &frame;
</span><span class="cx"> m_writer.setFrame(&frame);
</span></span></pre>
</div>
</div>
</body>
</html>