Title: [194592] trunk/Source/WebKit2
- Revision
- 194592
- Author
- [email protected]
- Date
- 2016-01-05 11:24:23 -0800 (Tue, 05 Jan 2016)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (194591 => 194592)
--- 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)
@@ -1,3 +1,26 @@
+2016-01-05 Alex Christensen <[email protected]>
+
+ 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):
+
2016-01-04 Carlos Garcia Campos <[email protected]>
[GTK] Allow to save and restore session
Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (194591 => 194592)
--- 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)
@@ -36,7 +36,7 @@
namespace WebKit {
-DownloadManager::DownloadManager(Client* client)
+DownloadManager::DownloadManager(Client& client)
: m_client(client)
{
}
@@ -105,22 +105,22 @@
void DownloadManager::didCreateDownload()
{
- m_client->didCreateDownload();
+ m_client.didCreateDownload();
}
void DownloadManager::didDestroyDownload()
{
- m_client->didDestroyDownload();
+ m_client.didDestroyDownload();
}
IPC::Connection* DownloadManager::downloadProxyConnection()
{
- return m_client->downloadProxyConnection();
+ return m_client.downloadProxyConnection();
}
AuthenticationManager& DownloadManager::downloadsAuthenticationManager()
{
- return m_client->downloadsAuthenticationManager();
+ return m_client.downloadsAuthenticationManager();
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (194591 => 194592)
--- 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)
@@ -26,7 +26,7 @@
#ifndef DownloadManager_h
#define DownloadManager_h
-#include "Download.h"
+#include "DownloadID.h"
#include "SandboxExtension.h"
#include <WebCore/NotImplemented.h>
#include <wtf/Forward.h>
@@ -51,7 +51,6 @@
class AuthenticationManager;
class Download;
-class WebPage;
class DownloadManager {
WTF_MAKE_NONCOPYABLE(DownloadManager);
@@ -67,7 +66,7 @@
virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
};
- explicit DownloadManager(Client*);
+ explicit DownloadManager(Client&);
void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
#if USE(NETWORK_SESSION)
@@ -93,7 +92,7 @@
AuthenticationManager& downloadsAuthenticationManager();
private:
- Client* m_client;
+ Client& m_client;
HashMap<DownloadID, std::unique_ptr<Download>> m_downloads;
};
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (194591 => 194592)
--- 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)
@@ -103,7 +103,7 @@
DownloadManager& NetworkProcess::downloadManager()
{
- static NeverDestroyed<DownloadManager> downloadManager(this);
+ static NeverDestroyed<DownloadManager> downloadManager(*this);
return downloadManager;
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (194591 => 194592)
--- 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)
@@ -134,7 +134,6 @@
DownloadID takeDownloadID(NetworkDataTask::TaskIdentifier);
private:
- WebCore::SessionID m_sessionID;
HashMap<NetworkDataTask::TaskIdentifier, NetworkDataTask*> m_dataTaskMap;
HashMap<NetworkDataTask::TaskIdentifier, DownloadID> m_downloadMap;
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (194591 => 194592)
--- 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)
@@ -28,6 +28,7 @@
#if USE(NETWORK_SESSION)
+#import "Download.h"
#import "NetworkProcess.h"
#import "SessionTracker.h"
#import <Foundation/NSURLSession.h>
@@ -200,7 +201,6 @@
}
NetworkSession::NetworkSession(Type type, WebCore::SessionID sessionID)
- : m_sessionID(sessionID)
{
m_sessionDelegate = adoptNS([[WKNetworkSessionDelegate alloc] initWithNetworkSession:*this]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
