<!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>[206367] trunk/Source/WebKit2</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/206367">206367</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-25 22:35:55 -0700 (Sun, 25 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/206356">r206356</a>): Caused crashes for !NETWORK_SESSION code path
https://bugs.webkit.org/show_bug.cgi?id=162541
Reviewed by Alexey Proskuryakov.
After <a href="http://trac.webkit.org/projects/webkit/changeset/206356">r206356</a>, if Download is downloading a Blob instead of doing a
network load, then m_resourceHandle / m_downloadClient are used to do
the download. This broke some assumptions on Mac because the
NETWORK_SESSION code path assumed it was relying on m_download and the
!NETWORK_SESSION code path assumed it was using m_nsURLDownload /
m_delegate.
This patch refactors the code so that:
- The Download destructor now takes care of invalidating
m_resourceHandle and m_downloadClient before calling
platformInvalidate(). For the SOUP code path,
platformInvalidate() no longer needs to do anything
because SOUP uses m_resourceHandle / m_downloadClient
only. For the Mac !NETWORK_SESSION code path, we keep
invalidating m_nsURLDownload / m_delegate but we no
longer assume that those are initialized (given that
they are not when downloading a blob). Other
platforms do nothing in platformInvalidate() at the
moment.
- Download::cancel() now takes care of cancelling the
download if we're downloading a blob. Otherwise, we
call the platform specific cancelNetworkLoad(). This
is the same pattern that is used for start() /
startNetworkLoad().
* NetworkProcess/Downloads/BlobDownloadClient.cpp:
(WebKit::BlobDownloadClient::didCancel):
* NetworkProcess/Downloads/BlobDownloadClient.h:
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::~Download):
(WebKit::Download::cancel):
* NetworkProcess/Downloads/Download.h:
* NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:
(WebKit::Download::cancelNetworkLoad):
(WebKit::Download::cancel): Deleted.
* NetworkProcess/Downloads/ios/DownloadIOS.mm:
(WebKit::Download::cancelNetworkLoad):
(WebKit::Download::cancel): Deleted.
* NetworkProcess/Downloads/mac/DownloadMac.mm:
(WebKit::Download::cancelNetworkLoad):
(WebKit::Download::platformInvalidate):
(WebKit::Download::cancel): Deleted.
* NetworkProcess/Downloads/soup/DownloadSoup.cpp:
(WebKit::Download::cancelNetworkLoad):
(WebKit::Download::platformInvalidate):
(WebKit::Download::cancel): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsBlobDownloadClientcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsBlobDownloadClienth">trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadscocoaDownloadCocoamm">trunk/Source/WebKit2/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsiosDownloadIOSmm">trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsmacDownloadMacmm">trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2016-09-25 Chris Dumez <cdumez@apple.com>
+
+ Regression(r206356): Caused crashes for !NETWORK_SESSION code path
+ https://bugs.webkit.org/show_bug.cgi?id=162541
+
+ Reviewed by Alexey Proskuryakov.
+
+ After r206356, if Download is downloading a Blob instead of doing a
+ network load, then m_resourceHandle / m_downloadClient are used to do
+ the download. This broke some assumptions on Mac because the
+ NETWORK_SESSION code path assumed it was relying on m_download and the
+ !NETWORK_SESSION code path assumed it was using m_nsURLDownload /
+ m_delegate.
+
+ This patch refactors the code so that:
+ - The Download destructor now takes care of invalidating
+ m_resourceHandle and m_downloadClient before calling
+ platformInvalidate(). For the SOUP code path,
+ platformInvalidate() no longer needs to do anything
+ because SOUP uses m_resourceHandle / m_downloadClient
+ only. For the Mac !NETWORK_SESSION code path, we keep
+ invalidating m_nsURLDownload / m_delegate but we no
+ longer assume that those are initialized (given that
+ they are not when downloading a blob). Other
+ platforms do nothing in platformInvalidate() at the
+ moment.
+ - Download::cancel() now takes care of cancelling the
+ download if we're downloading a blob. Otherwise, we
+ call the platform specific cancelNetworkLoad(). This
+ is the same pattern that is used for start() /
+ startNetworkLoad().
+
+ * NetworkProcess/Downloads/BlobDownloadClient.cpp:
+ (WebKit::BlobDownloadClient::didCancel):
+ * NetworkProcess/Downloads/BlobDownloadClient.h:
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::~Download):
+ (WebKit::Download::cancel):
+ * NetworkProcess/Downloads/Download.h:
+ * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:
+ (WebKit::Download::cancelNetworkLoad):
+ (WebKit::Download::cancel): Deleted.
+ * NetworkProcess/Downloads/ios/DownloadIOS.mm:
+ (WebKit::Download::cancelNetworkLoad):
+ (WebKit::Download::cancel): Deleted.
+ * NetworkProcess/Downloads/mac/DownloadMac.mm:
+ (WebKit::Download::cancelNetworkLoad):
+ (WebKit::Download::platformInvalidate):
+ (WebKit::Download::cancel): Deleted.
+ * NetworkProcess/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::Download::cancelNetworkLoad):
+ (WebKit::Download::platformInvalidate):
+ (WebKit::Download::cancel): Deleted.
+
</ins><span class="cx"> 2016-09-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Enable support for 'download' attribute on anchor elements
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsBlobDownloadClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -76,6 +76,15 @@
</span><span class="cx"> m_download.didFinish();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void BlobDownloadClient::didCancel()
+{
+ closeFile(m_destinationFile);
+ if (!m_destinationPath.isEmpty())
+ deleteFile(m_destinationPath);
+
+ m_download.didCancel(IPC::DataReference());
+}
+
</ins><span class="cx"> void BlobDownloadClient::didFail(ResourceHandle*, const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> closeFile(m_destinationFile);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsBlobDownloadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.h (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.h 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.h 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit BlobDownloadClient(Download&);
</span><span class="cx">
</span><ins>+ void didCancel();
+
</ins><span class="cx"> private:
</span><span class="cx"> // ResourceHandleClient
</span><span class="cx"> void didReceiveResponse(WebCore::ResourceHandle*, WebCore::ResourceResponse&&) final;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -69,6 +69,13 @@
</span><span class="cx">
</span><span class="cx"> Download::~Download()
</span><span class="cx"> {
</span><ins>+ if (m_resourceHandle) {
+ m_resourceHandle->clearClient();
+ m_resourceHandle->cancel();
+ m_resourceHandle = nullptr;
+ }
+ m_downloadClient = nullptr;
+
</ins><span class="cx"> platformInvalidate();
</span><span class="cx">
</span><span class="cx"> m_downloadManager.didDestroyDownload();
</span><span class="lines">@@ -90,6 +97,17 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Download::cancel()
+{
+ if (m_request.url().protocolIsBlob()) {
+ auto resourceHandle = WTFMove(m_resourceHandle);
+ resourceHandle->cancel();
+ static_cast<BlobDownloadClient*>(m_downloadClient.get())->didCancel();
+ return;
+ }
+ cancelNetworkLoad();
+}
+
</ins><span class="cx"> void Download::didStart()
</span><span class="cx"> {
</span><span class="cx"> send(Messages::DownloadProxy::DidStart(m_request, m_suggestedName));
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><span class="cx"> void startNetworkLoad();
</span><span class="cx"> #endif
</span><ins>+ void cancelNetworkLoad();
</ins><span class="cx">
</span><span class="cx"> void platformInvalidate();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadscocoaDownloadCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::cancel()
</del><ins>+void Download::cancelNetworkLoad()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_download);
</span><span class="cx"> [m_download cancelByProducingResumeData: ^(NSData * _Nullable resumeData)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsiosDownloadIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::cancel()
</del><ins>+void Download::cancelNetworkLoad()
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsmacDownloadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> [m_nsURLDownload setDeletesFileUponFailure:NO];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::cancel()
</del><ins>+void Download::cancelNetworkLoad()
</ins><span class="cx"> {
</span><span class="cx"> [m_nsURLDownload cancel];
</span><span class="cx">
</span><span class="lines">@@ -119,11 +119,10 @@
</span><span class="cx">
</span><span class="cx"> void Download::platformInvalidate()
</span><span class="cx"> {
</span><del>- ASSERT(m_nsURLDownload);
- ASSERT(m_delegate);
-
- [m_delegate invalidate];
- m_delegate = nullptr;
</del><ins>+ if (m_delegate) {
+ [m_delegate invalidate];
+ m_delegate = nullptr;
+ }
</ins><span class="cx"> m_nsURLDownload = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp (206366 => 206367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-09-26 03:57:40 UTC (rev 206366)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp 2016-09-26 05:35:55 UTC (rev 206367)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Download::cancel()
</del><ins>+void Download::cancelNetworkLoad()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_resourceHandle)
</span><span class="cx"> return;
</span><span class="lines">@@ -245,13 +245,6 @@
</span><span class="cx">
</span><span class="cx"> void Download::platformInvalidate()
</span><span class="cx"> {
</span><del>- if (m_resourceHandle) {
- m_resourceHandle->clearClient();
- m_resourceHandle->cancel();
- m_resourceHandle = nullptr;
- }
-
- m_downloadClient = nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Download::platformDidFinish()
</span></span></pre>
</div>
</div>
</body>
</html>