<!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>[212257] 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/212257">212257</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-13 16:16:10 -0800 (Mon, 13 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !m_bodyLoader
https://bugs.webkit.org/show_bug.cgi?id=166986
Patch by Youenn Fablet <youenn@apple.com> on 2017-02-13
Reviewed by Sam Weinig.
Refactoring to make the unset/set pending activity part of body loader.
This allows ensuring to not forget to do that by simply deleting the body loader.
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::fetch):
(WebCore::FetchResponse::BodyLoader::didSucceed):
(WebCore::FetchResponse::BodyLoader::didFail):
(WebCore::FetchResponse::BodyLoader::BodyLoader):
(WebCore::FetchResponse::BodyLoader::~BodyLoader):
(WebCore::FetchResponse::stop):
* Modules/fetch/FetchResponse.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212256 => 212257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-13 23:26:46 UTC (rev 212256)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 00:16:10 UTC (rev 212257)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-13 Youenn Fablet <youenn@apple.com>
+
+ ASSERTION FAILED: !m_bodyLoader
+ https://bugs.webkit.org/show_bug.cgi?id=166986
+
+ Reviewed by Sam Weinig.
+
+ Refactoring to make the unset/set pending activity part of body loader.
+ This allows ensuring to not forget to do that by simply deleting the body loader.
+
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::fetch):
+ (WebCore::FetchResponse::BodyLoader::didSucceed):
+ (WebCore::FetchResponse::BodyLoader::didFail):
+ (WebCore::FetchResponse::BodyLoader::BodyLoader):
+ (WebCore::FetchResponse::BodyLoader::~BodyLoader):
+ (WebCore::FetchResponse::stop):
+ * Modules/fetch/FetchResponse.h:
+
</ins><span class="cx"> 2017-02-13 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused WebCoreThreadSafe.h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (212256 => 212257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2017-02-13 23:26:46 UTC (rev 212256)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2017-02-14 00:16:10 UTC (rev 212257)
</span><span class="lines">@@ -106,9 +106,6 @@
</span><span class="cx"> }
</span><span class="cx"> auto response = adoptRef(*new FetchResponse(context, FetchBody::loadingBody(), FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
</span><span class="cx">
</span><del>- // Setting pending activity until BodyLoader didFail or didSucceed callback is called.
- response->setPendingActivity(response.ptr());
-
</del><span class="cx"> response->m_bodyLoader.emplace(response.get(), WTFMove(promise));
</span><span class="cx"> if (!response->m_bodyLoader->start(context, request))
</span><span class="cx"> response->m_bodyLoader = std::nullopt;
</span><span class="lines">@@ -131,9 +128,10 @@
</span><span class="cx"> m_response.closeStream();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_loader->isStarted())
</del><ins>+ if (m_loader->isStarted()) {
+ Ref<FetchResponse> protector(m_response);
</ins><span class="cx"> m_response.m_bodyLoader = std::nullopt;
</span><del>- m_response.unsetPendingActivity(&m_response);
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FetchResponse::BodyLoader::didFail()
</span><span class="lines">@@ -151,10 +149,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Check whether didFail is called as part of FetchLoader::start.
</span><del>- if (m_loader->isStarted())
</del><ins>+ if (m_loader->isStarted()) {
+ Ref<FetchResponse> protector(m_response);
</ins><span class="cx"> m_response.m_bodyLoader = std::nullopt;
</span><del>-
- m_response.unsetPendingActivity(&m_response);
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FetchResponse::BodyLoader::BodyLoader(FetchResponse& response, FetchPromise&& promise)
</span><span class="lines">@@ -161,8 +159,14 @@
</span><span class="cx"> : m_response(response)
</span><span class="cx"> , m_promise(WTFMove(promise))
</span><span class="cx"> {
</span><ins>+ m_response.setPendingActivity(&m_response);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+FetchResponse::BodyLoader::~BodyLoader()
+{
+ m_response.unsetPendingActivity(&m_response);
+}
+
</ins><span class="cx"> void FetchResponse::BodyLoader::didReceiveResponse(const ResourceResponse& resourceResponse)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_promise);
</span><span class="lines">@@ -341,7 +345,7 @@
</span><span class="cx"> FetchBodyOwner::stop();
</span><span class="cx"> if (m_bodyLoader) {
</span><span class="cx"> m_bodyLoader->stop();
</span><del>- ASSERT(!m_bodyLoader);
</del><ins>+ m_bodyLoader = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (212256 => 212257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2017-02-13 23:26:46 UTC (rev 212256)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2017-02-14 00:16:10 UTC (rev 212257)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> class BodyLoader final : public FetchLoaderClient {
</span><span class="cx"> public:
</span><span class="cx"> BodyLoader(FetchResponse&, FetchPromise&&);
</span><ins>+ ~BodyLoader();
</ins><span class="cx">
</span><span class="cx"> bool start(ScriptExecutionContext&, const FetchRequest&);
</span><span class="cx"> void stop();
</span></span></pre>
</div>
</div>
</body>
</html>