<!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>[186642] trunk/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/186642">186642</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 15:30:42 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DocumentLoader::detachFromFrame() is being called with no current Frame set.
<rdar://problem/21293082> and https://bugs.webkit.org/show_bug.cgi?id=146786
Reviewed by Sam Weinig.
No new tests (Unknown how to reproduce).
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::attachToFrame):
(WebCore::DocumentLoader::detachFromFrame): Null check m_frame before dereferencing it.
(WebCore::DocumentLoader::setFrame): Deleted, renamed to attachToFrame(), and take's
a Frame& instead of a Frame*.
* loader/DocumentLoader.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::initForSynthesizedDocument): setFrame is now attachToFrame.
(WebCore::FrameLoader::setPolicyDocumentLoader): Ditto.
(WebCore::FrameLoader::transitionToCommitted): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186641 => 186642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/ChangeLog        2015-07-09 22:30:42 UTC (rev 186642)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-07-09 Brady Eidson <beidson@apple.com>
+
+ DocumentLoader::detachFromFrame() is being called with no current Frame set.
+ <rdar://problem/21293082> and https://bugs.webkit.org/show_bug.cgi?id=146786
+
+ Reviewed by Sam Weinig.
+
+ No new tests (Unknown how to reproduce).
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::attachToFrame):
+ (WebCore::DocumentLoader::detachFromFrame): Null check m_frame before dereferencing it.
+ (WebCore::DocumentLoader::setFrame): Deleted, renamed to attachToFrame(), and take's
+ a Frame& instead of a Frame*.
+ * loader/DocumentLoader.h:
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::initForSynthesizedDocument): setFrame is now attachToFrame.
+ (WebCore::FrameLoader::setPolicyDocumentLoader): Ditto.
+ (WebCore::FrameLoader::transitionToCommitted): Ditto.
+
</ins><span class="cx"> 2015-07-09 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose MediaStream methods to be used in the MediaStream Engine
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (186641 => 186642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp        2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp        2015-07-09 22:30:42 UTC (rev 186642)
</span><span class="lines">@@ -899,13 +899,11 @@
</span><span class="cx"> m_frame->document()->domWindow()->finishedLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::setFrame(Frame* frame)
</del><ins>+void DocumentLoader::attachToFrame(Frame& frame)
</ins><span class="cx"> {
</span><del>- if (m_frame == frame)
- return;
- ASSERT(frame && !m_frame);
- m_frame = frame;
- m_writer.setFrame(frame);
</del><ins>+ ASSERT(!m_frame);
+ m_frame = &frame;
+ m_writer.setFrame(&frame);
</ins><span class="cx"> attachToFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -930,7 +928,14 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_applicationCacheHost->setDOMApplicationCache(nullptr);
</span><del>- InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
</del><ins>+
+ // Even though we ASSERT at the top of this method that we have an m_frame, we're seeing crashes where m_frame is null.
+ // This means either that a DocumentLoader is detaching twice, or is detaching before ever having attached.
+ // Until we figure out how that is happening, null check m_frame before dereferencing it here.
+ // <rdar://problem/21293082> and https://bugs.webkit.org/show_bug.cgi?id=146786
+ if (m_frame)
+ InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
+
</ins><span class="cx"> m_frame = nullptr;
</span><span class="cx"> // The call to stopLoading() above should have canceled any pending content policy check.
</span><span class="cx"> ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback needs a valid frame.");
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (186641 => 186642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h        2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/loader/DocumentLoader.h        2015-07-09 22:30:42 UTC (rev 186642)
</span><span class="lines">@@ -88,10 +88,9 @@
</span><span class="cx"> }
</span><span class="cx"> WEBCORE_EXPORT virtual ~DocumentLoader();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setFrame(Frame*);
</del><ins>+ void attachToFrame(Frame&);
</ins><span class="cx"> Frame* frame() const { return m_frame; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT virtual void attachToFrame();
</del><span class="cx"> WEBCORE_EXPORT virtual void detachFromFrame();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT FrameLoader* frameLoader() const;
</span><span class="lines">@@ -281,6 +280,8 @@
</span><span class="cx"> protected:
</span><span class="cx"> WEBCORE_EXPORT DocumentLoader(const ResourceRequest&, const SubstituteData&);
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT virtual void attachToFrame();
+
</ins><span class="cx"> bool m_deferMainResourceDataLoad;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (186641 => 186642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp        2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp        2015-07-09 22:30:42 UTC (rev 186642)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> // FrameLoader::checkCompleted() will overwrite the URL of the document to be activeDocumentLoader()->documentURL().
</span><span class="cx">
</span><span class="cx"> RefPtr<DocumentLoader> loader = m_client.createDocumentLoader(ResourceRequest(URL(ParsedURLString, emptyString())), SubstituteData());
</span><del>- loader->setFrame(&m_frame);
</del><ins>+ loader->attachToFrame(m_frame);
</ins><span class="cx"> loader->setResponse(ResourceResponse(URL(), ASCIILiteral("text/html"), 0, String()));
</span><span class="cx"> loader->setCommitted(true);
</span><span class="cx"> setDocumentLoader(loader.get());
</span><span class="lines">@@ -1697,7 +1697,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (loader)
</span><del>- loader->setFrame(&m_frame);
</del><ins>+ loader->attachToFrame(m_frame);
</ins><span class="cx"> if (m_policyDocumentLoader
</span><span class="cx"> && m_policyDocumentLoader != m_provisionalDocumentLoader
</span><span class="cx"> && m_policyDocumentLoader != m_documentLoader)
</span><span class="lines">@@ -1937,7 +1937,7 @@
</span><span class="cx"> if (cachedPage) {
</span><span class="cx"> DocumentLoader* cachedDocumentLoader = cachedPage->documentLoader();
</span><span class="cx"> ASSERT(cachedDocumentLoader);
</span><del>- cachedDocumentLoader->setFrame(&m_frame);
</del><ins>+ cachedDocumentLoader->attachToFrame(m_frame);
</ins><span class="cx"> m_client.transitionToCommittedFromCachedFrame(cachedPage->cachedMainFrame());
</span><span class="cx"> } else
</span><span class="cx"> m_client.transitionToCommittedForNewPage();
</span></span></pre>
</div>
</div>
</body>
</html>