<!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>[214941] releases/WebKitGTK/webkit-2.14</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/214941">214941</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-05 03:41:09 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206633">r206633</a> - DumpRenderTree crashed in com.apple.WebCore: WTF::Optional<WebCore::FetchBodyOwner::BlobLoader>::operator bool const + 12
https://bugs.webkit.org/show_bug.cgi?id=162483
Patch by Youenn Fablet <youenn@apple.com> on 2016-09-30
Reviewed by Alex Christensen.
Source/WebCore:
Test: fetch/closing-while-fetching-blob.html
No change of behavior.
* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::stop): Asserting m_blobLoader is null (meaning that unsetPendingActivity was done)
only in case FetchBodyOwner has no risk being destroyed.
LayoutTests:
* fetch/closing-while-fetching-blob-expected.txt: Added.
* fetch/closing-while-fetching-blob.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreModulesfetchFetchBodyOwnercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfetchclosingwhilefetchingblobexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfetchclosingwhilefetchingblobhtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (214940 => 214941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-04-05 10:40:31 UTC (rev 214940)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-04-05 10:41:09 UTC (rev 214941)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-30 Youenn Fablet <youenn@apple.com>
+
+ DumpRenderTree crashed in com.apple.WebCore: WTF::Optional<WebCore::FetchBodyOwner::BlobLoader>::operator bool const + 12
+ https://bugs.webkit.org/show_bug.cgi?id=162483
+
+ Reviewed by Alex Christensen.
+
+ * fetch/closing-while-fetching-blob-expected.txt: Added.
+ * fetch/closing-while-fetching-blob.html: Added.
+
</ins><span class="cx"> 2017-02-09 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Tear down existing renderers when adding a shadow root.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfetchclosingwhilefetchingblobexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob-expected.txt (0 => 214941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob-expected.txt 2017-04-05 10:41:09 UTC (rev 214941)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfetchclosingwhilefetchingblobhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob.html (0 => 214941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fetch/closing-while-fetching-blob.html 2017-04-05 10:41:09 UTC (rev 214941)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Fetch: closing while retrieving blob should lead to unset pending activity without crashing/asserting</title>
+ <script src="../resources/gc.js"></script>
+ </head>
+ <body>
+ <div>PASS</div>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ // test is passing if no crashes
+ new Response(new Blob(["this is a test"])).text();
+ window.gc();
+ window.location = "about:blank";
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (214940 => 214941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-04-05 10:40:31 UTC (rev 214940)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-04-05 10:41:09 UTC (rev 214941)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-09-30 Youenn Fablet <youenn@apple.com>
+
+ DumpRenderTree crashed in com.apple.WebCore: WTF::Optional<WebCore::FetchBodyOwner::BlobLoader>::operator bool const + 12
+ https://bugs.webkit.org/show_bug.cgi?id=162483
+
+ Reviewed by Alex Christensen.
+
+ Test: fetch/closing-while-fetching-blob.html
+ No change of behavior.
+
+ * Modules/fetch/FetchBodyOwner.cpp:
+ (WebCore::FetchBodyOwner::stop): Asserting m_blobLoader is null (meaning that unsetPendingActivity was done)
+ only in case FetchBodyOwner has no risk being destroyed.
+
</ins><span class="cx"> 2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r211967.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (214940 => 214941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2017-04-05 10:40:31 UTC (rev 214940)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2017-04-05 10:41:09 UTC (rev 214941)
</span><span class="lines">@@ -51,10 +51,12 @@
</span><span class="cx"> m_body.cleanConsumePromise();
</span><span class="cx">
</span><span class="cx"> if (m_blobLoader) {
</span><ins>+ bool isUniqueReference = hasOneRef();
</ins><span class="cx"> if (m_blobLoader->loader)
</span><span class="cx"> m_blobLoader->loader->stop();
</span><ins>+ // After that point, 'this' may be destroyed, since unsetPendingActivity should have been called.
+ ASSERT_UNUSED(isUniqueReference, isUniqueReference || !m_blobLoader);
</ins><span class="cx"> }
</span><del>- ASSERT(!m_blobLoader);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FetchBodyOwner::isDisturbed() const
</span></span></pre>
</div>
</div>
</body>
</html>