Remove unused WebProcessPool::requestNetworkingStatistics
https://bugs.webkit.org/show_bug.cgi?id=202818
Patch by Alex Christensen <achristensen@webkit.org> on 2019-10-10
Reviewed by Chris Dumez.
Its only use was removed in rdar://problem/56160996
* NetworkProcess/Downloads/DownloadManager.h:
(WebKit::DownloadManager::isDownloading const):
(WebKit::DownloadManager::activeDownloadCount const): Deleted.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::getNetworkProcessStatistics): Deleted.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* Shared/Authentication/AuthenticationManager.h:
(WebKit::AuthenticationManager::outstandingAuthenticationChallengeCount const): Deleted.
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::didReceiveMessage):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::getStatistics):
(WebKit::WebProcessPool::requestNetworkingStatistics): Deleted.
* UIProcess/WebProcessPool.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index d517270..b48cd2e 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,28 @@
+2019-10-10 Alex Christensen <achristensen@webkit.org>
+
+ Remove unused WebProcessPool::requestNetworkingStatistics
+ https://bugs.webkit.org/show_bug.cgi?id=202818
+
+ Reviewed by Chris Dumez.
+
+ Its only use was removed in rdar://problem/56160996
+
+ * NetworkProcess/Downloads/DownloadManager.h:
+ (WebKit::DownloadManager::isDownloading const):
+ (WebKit::DownloadManager::activeDownloadCount const): Deleted.
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::getNetworkProcessStatistics): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * Shared/Authentication/AuthenticationManager.h:
+ (WebKit::AuthenticationManager::outstandingAuthenticationChallengeCount const): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::didReceiveMessage):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::getStatistics):
+ (WebKit::WebProcessPool::requestNetworkingStatistics): Deleted.
+ * UIProcess/WebProcessPool.h:
+
2019-10-10 Basuke Suzuki <Basuke.Suzuki@sony.com>
[WinCairo] Move remote communication handling from RemoteInspectorServer to RemoteInspector.
diff --git a/Source/WebKit/NetworkProcess/Downloads/DownloadManager.h b/Source/WebKit/NetworkProcess/Downloads/DownloadManager.h
index 8c823cc..8d2188d 100644
--- a/Source/WebKit/NetworkProcess/Downloads/DownloadManager.h
+++ b/Source/WebKit/NetworkProcess/Downloads/DownloadManager.h
@@ -98,7 +98,6 @@
void downloadFinished(Download&);
bool isDownloading() const { return !m_downloads.isEmpty(); }
- uint64_t activeDownloadCount() const { return m_downloads.size(); }
void applicationDidEnterBackground();
void applicationWillEnterForeground();
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
index 0ca1767..14259b1 100644
--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
@@ -2020,16 +2020,6 @@
});
}
-void NetworkProcess::getNetworkProcessStatistics(uint64_t callbackID)
-{
- StatisticsData data;
-
- data.statisticsNumbers.set("DownloadsActiveCount", downloadManager().activeDownloadCount());
- data.statisticsNumbers.set("OutstandingAuthenticationChallengesCount", authenticationManager().outstandingAuthenticationChallengeCount());
-
- parentProcessConnection()->send(Messages::WebProcessPool::DidGetStatistics(data, callbackID), 0);
-}
-
void NetworkProcess::setAllowsAnySSLCertificateForWebSocket(bool allows, CompletionHandler<void()>&& completionHandler)
{
DeprecatedGlobalSettings::setAllowsAnySSLCertificate(allows);
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
index b99d4f2..c130cac 100644
--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
@@ -417,7 +417,6 @@
void setCacheModel(CacheModel, String overrideCacheStorageDirectory);
void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
- void getNetworkProcessStatistics(uint64_t callbackID);
void clearCacheForAllOrigins(uint32_t cachesToClear);
void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
index 7399a7e..ce5b6ba 100644
--- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
@@ -68,8 +68,6 @@
AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
- GetNetworkProcessStatistics(uint64_t callbackID)
-
ClearCacheForAllOrigins(uint32_t cachesToClear)
SetCacheModel(enum:uint8_t WebKit::CacheModel cacheModel, String overrideCacheStorageDirectory);
diff --git a/Source/WebKit/Shared/Authentication/AuthenticationManager.h b/Source/WebKit/Shared/Authentication/AuthenticationManager.h
index 00ac13b..07438bd 100644
--- a/Source/WebKit/Shared/Authentication/AuthenticationManager.h
+++ b/Source/WebKit/Shared/Authentication/AuthenticationManager.h
@@ -74,8 +74,6 @@
void completeAuthenticationChallenge(uint64_t challengeID, AuthenticationChallengeDisposition, WebCore::Credential&&);
- uint64_t outstandingAuthenticationChallengeCount() const { return m_challenges.size(); }
-
private:
struct Challenge {
WebPageProxyIdentifier pageID;
diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
index 94aefe4..4b5edfc 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
@@ -1801,9 +1801,6 @@
if (statisticsMask & StatisticsRequestTypeWebContent)
requestWebContentStatistics(request.get());
-
- if (statisticsMask & StatisticsRequestTypeNetworking)
- requestNetworkingStatistics(request.get());
}
void WebProcessPool::requestWebContentStatistics(StatisticsRequest& request)
@@ -1811,18 +1808,6 @@
// FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
}
-void WebProcessPool::requestNetworkingStatistics(StatisticsRequest& request)
-{
- if (!m_networkProcess) {
- LOG_ERROR("Attempt to get NetworkProcess statistics but the NetworkProcess is unavailable");
- return;
- }
-
- uint64_t requestID = request.addOutstandingRequest();
- m_statisticsRequests.set(requestID, &request);
- m_networkProcess->send(Messages::NetworkProcess::GetNetworkProcessStatistics(requestID), 0);
-}
-
static WebProcessProxy* webProcessProxyFromConnection(IPC::Connection& connection, const Vector<RefPtr<WebProcessProxy>>& processes)
{
for (auto& process : processes) {
diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
index 3c8f639..05b8721 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.h
+++ b/Source/WebKit/UIProcess/WebProcessPool.h
@@ -541,7 +541,6 @@
void initializeNewWebProcess(WebProcessProxy&, WebsiteDataStore*, WebProcessProxy::IsPrewarmed = WebProcessProxy::IsPrewarmed::No);
void requestWebContentStatistics(StatisticsRequest&);
- void requestNetworkingStatistics(StatisticsRequest&);
void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
