<!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>[194592] 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/194592">194592</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-05 11:24:23 -0800 (Tue, 05 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up download code
https://bugs.webkit.org/show_bug.cgi?id=152739
Reviewed by Brady Eidson.
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::DownloadManager):
(WebKit::DownloadManager::didCreateDownload):
(WebKit::DownloadManager::didDestroyDownload):
(WebKit::DownloadManager::downloadProxyConnection):
(WebKit::DownloadManager::downloadsAuthenticationManager):
* NetworkProcess/Downloads/DownloadManager.h:
Keep a Client& instead of a Client*.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::downloadManager):
* NetworkProcess/NetworkSession.h:
m_sessionID is not used. There is no need to store the sessionID if it is only used in the NetworkSession constructor.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSession::defaultSession):
(WebKit::NetworkSession::NetworkSession):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkSessionh">trunk/Source/WebKit2/NetworkProcess/NetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194591 => 194592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-05 19:12:05 UTC (rev 194591)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-05 19:24:23 UTC (rev 194592)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-01-05 Alex Christensen <achristensen@webkit.org>
+
+ Clean up download code
+ https://bugs.webkit.org/show_bug.cgi?id=152739
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::DownloadManager):
+ (WebKit::DownloadManager::didCreateDownload):
+ (WebKit::DownloadManager::didDestroyDownload):
+ (WebKit::DownloadManager::downloadProxyConnection):
+ (WebKit::DownloadManager::downloadsAuthenticationManager):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ Keep a Client& instead of a Client*.
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::downloadManager):
+ * NetworkProcess/NetworkSession.h:
+ m_sessionID is not used. There is no need to store the sessionID if it is only used in the NetworkSession constructor.
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSession::defaultSession):
+ (WebKit::NetworkSession::NetworkSession):
+
</ins><span class="cx"> 2016-01-04 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Allow to save and restore session
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (194591 => 194592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-01-05 19:12:05 UTC (rev 194591)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-01-05 19:24:23 UTC (rev 194592)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-DownloadManager::DownloadManager(Client* client)
</del><ins>+DownloadManager::DownloadManager(Client& client)
</ins><span class="cx"> : m_client(client)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -105,22 +105,22 @@
</span><span class="cx">
</span><span class="cx"> void DownloadManager::didCreateDownload()
</span><span class="cx"> {
</span><del>- m_client->didCreateDownload();
</del><ins>+ m_client.didCreateDownload();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DownloadManager::didDestroyDownload()
</span><span class="cx"> {
</span><del>- m_client->didDestroyDownload();
</del><ins>+ m_client.didDestroyDownload();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IPC::Connection* DownloadManager::downloadProxyConnection()
</span><span class="cx"> {
</span><del>- return m_client->downloadProxyConnection();
</del><ins>+ return m_client.downloadProxyConnection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AuthenticationManager& DownloadManager::downloadsAuthenticationManager()
</span><span class="cx"> {
</span><del>- return m_client->downloadsAuthenticationManager();
</del><ins>+ return m_client.downloadsAuthenticationManager();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (194591 => 194592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-05 19:12:05 UTC (rev 194591)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-01-05 19:24:23 UTC (rev 194592)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef DownloadManager_h
</span><span class="cx"> #define DownloadManager_h
</span><span class="cx">
</span><del>-#include "Download.h"
</del><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> class AuthenticationManager;
</span><span class="cx"> class Download;
</span><del>-class WebPage;
</del><span class="cx">
</span><span class="cx"> class DownloadManager {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DownloadManager);
</span><span class="lines">@@ -67,7 +66,7 @@
</span><span class="cx"> virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- explicit DownloadManager(Client*);
</del><ins>+ explicit DownloadManager(Client&);
</ins><span class="cx">
</span><span class="cx"> void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="lines">@@ -93,7 +92,7 @@
</span><span class="cx"> AuthenticationManager& downloadsAuthenticationManager();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Client* m_client;
</del><ins>+ Client& m_client;
</ins><span class="cx"> HashMap<DownloadID, std::unique_ptr<Download>> m_downloads;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (194591 => 194592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-01-05 19:12:05 UTC (rev 194591)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-01-05 19:24:23 UTC (rev 194592)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> DownloadManager& NetworkProcess::downloadManager()
</span><span class="cx"> {
</span><del>- static NeverDestroyed<DownloadManager> downloadManager(this);
</del><ins>+ static NeverDestroyed<DownloadManager> downloadManager(*this);
</ins><span class="cx"> return downloadManager;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (194591 => 194592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-05 19:12:05 UTC (rev 194591)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-05 19:24:23 UTC (rev 194592)
</span><span class="lines">@@ -134,7 +134,6 @@
</span><span class="cx"> DownloadID takeDownloadID(NetworkDataTask::TaskIdentifier);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebCore::SessionID m_sessionID;
</del><span class="cx"> HashMap<NetworkDataTask::TaskIdentifier, NetworkDataTask*> m_dataTaskMap;
</span><span class="cx"> HashMap<NetworkDataTask::TaskIdentifier, DownloadID> m_downloadMap;
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (194591 => 194592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-05 19:12:05 UTC (rev 194591)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-05 19:24:23 UTC (rev 194592)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx">
</span><ins>+#import "Download.h"
</ins><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx"> #import "SessionTracker.h"
</span><span class="cx"> #import <Foundation/NSURLSession.h>
</span><span class="lines">@@ -200,7 +201,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkSession::NetworkSession(Type type, WebCore::SessionID sessionID)
</span><del>- : m_sessionID(sessionID)
</del><span class="cx"> {
</span><span class="cx"> m_sessionDelegate = adoptNS([[WKNetworkSessionDelegate alloc] initWithNetworkSession:*this]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>