Diff
Modified: trunk/Source/WebKit/ChangeLog (234260 => 234261)
--- trunk/Source/WebKit/ChangeLog 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/ChangeLog 2018-07-26 16:15:30 UTC (rev 234261)
@@ -1,3 +1,36 @@
+2018-07-26 Chris Dumez <[email protected]>
+
+ WebSiteData-related methods should take in CompletionHandlers instead of Functions
+ https://bugs.webkit.org/show_bug.cgi?id=188027
+
+ Reviewed by Alex Christensen.
+
+ WebSiteData-related methods should take in CompletionHandlers instead of Functions since
+ they are need to be called and are only called once.
+
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::fetchWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::fetchWebsiteData):
+ (WebKit::PluginProcessProxy::deleteWebsiteData):
+ (WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Storage/StorageProcessProxy.cpp:
+ (WebKit::StorageProcessProxy::fetchWebsiteData):
+ (WebKit::StorageProcessProxy::deleteWebsiteData):
+ (WebKit::StorageProcessProxy::deleteWebsiteDataForOrigins):
+ * UIProcess/Storage/StorageProcessProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores):
+ (WebKit::WebProcessProxy::topPrivatelyControlledDomainsWithWebsiteData):
+ (WebKit::WebProcessProxy::fetchWebsiteData):
+ (WebKit::WebProcessProxy::deleteWebsiteData):
+ (WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
+ * UIProcess/WebProcessProxy.h:
+
2018-07-26 Miguel Gomez <[email protected]>
[GTK][WPE] Improve the way request displayRefresh notifications
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2018-07-26 16:15:30 UTC (rev 234261)
@@ -143,7 +143,7 @@
return m_downloadProxyMap->createDownloadProxy(m_processPool, resourceRequest);
}
-void NetworkProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, WTF::Function<void (WebsiteData)>&& completionHandler)
+void NetworkProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, CompletionHandler<void (WebsiteData)>&& completionHandler)
{
ASSERT(canSendMessage());
@@ -162,7 +162,7 @@
send(Messages::NetworkProcess::FetchWebsiteData(sessionID, dataTypes, fetchOptions, callbackID), 0);
}
-void NetworkProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, WTF::Function<void ()>&& completionHandler)
+void NetworkProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
{
auto callbackID = generateCallbackID();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data", this);
@@ -178,7 +178,7 @@
send(Messages::NetworkProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
}
-void NetworkProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, WTF::Function<void()>&& completionHandler)
+void NetworkProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, CompletionHandler<void()>&& completionHandler)
{
ASSERT(canSendMessage());
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2018-07-26 16:15:30 UTC (rev 234261)
@@ -73,9 +73,9 @@
DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
- void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, WTF::Function<void(WebsiteData)>&& completionHandler);
- void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, WTF::Function<void()>&& completionHandler);
- void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebKit::WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, WTF::Function<void()>&& completionHandler);
+ void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, CompletionHandler<void(WebsiteData)>&&);
+ void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, CompletionHandler<void()>&& completionHandler);
+ void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebKit::WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, CompletionHandler<void()>&&);
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst, CompletionHandler<void()>&&);
@@ -165,9 +165,9 @@
unsigned m_numPendingConnectionRequests;
Deque<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> m_pendingConnectionReplies;
- HashMap<uint64_t, Function<void(WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
- HashMap<uint64_t, Function<void()>> m_pendingDeleteWebsiteDataCallbacks;
- HashMap<uint64_t, Function<void()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
+ HashMap<uint64_t, CompletionHandler<void(WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
+ HashMap<uint64_t, CompletionHandler<void()>> m_pendingDeleteWebsiteDataCallbacks;
+ HashMap<uint64_t, CompletionHandler<void()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
Modified: trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp 2018-07-26 16:15:30 UTC (rev 234261)
@@ -113,7 +113,7 @@
m_connection->send(Messages::PluginProcess::CreateWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
}
-void PluginProcessProxy::fetchWebsiteData(WTF::Function<void (Vector<String>)>&& completionHandler)
+void PluginProcessProxy::fetchWebsiteData(CompletionHandler<void (Vector<String>)>&& completionHandler)
{
uint64_t callbackID = generateCallbackID();
m_pendingFetchWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
@@ -126,7 +126,7 @@
m_connection->send(Messages::PluginProcess::GetSitesWithData(callbackID), 0);
}
-void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, WTF::Function<void ()>&& completionHandler)
+void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
{
uint64_t callbackID = generateCallbackID();
m_pendingDeleteWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
@@ -139,7 +139,7 @@
m_connection->send(Messages::PluginProcess::DeleteWebsiteData(modifiedSince, callbackID), 0);
}
-void PluginProcessProxy::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, WTF::Function<void ()>&& completionHandler)
+void PluginProcessProxy::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, CompletionHandler<void ()>&& completionHandler)
{
uint64_t callbackID = generateCallbackID();
m_pendingDeleteWebsiteDataForHostNamesCallbacks.set(callbackID, WTFMove(completionHandler));
Modified: trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h 2018-07-26 16:15:30 UTC (rev 234261)
@@ -78,9 +78,9 @@
// encoded in the given argument encoder and sent back to the connection of the given web process.
void getPluginProcessConnection(Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply&&);
- void fetchWebsiteData(WTF::Function<void (Vector<String>)>&& completionHandler);
- void deleteWebsiteData(WallTime modifiedSince, WTF::Function<void ()>&& completionHandler);
- void deleteWebsiteDataForHostNames(const Vector<String>& hostNames, WTF::Function<void ()>&& completionHandler);
+ void fetchWebsiteData(CompletionHandler<void (Vector<String>)>&&);
+ void deleteWebsiteData(WallTime modifiedSince, CompletionHandler<void ()>&&);
+ void deleteWebsiteDataForHostNames(const Vector<String>& hostNames, CompletionHandler<void ()>&&);
#if OS(LINUX)
void sendMemoryPressureEvent(bool isCritical);
@@ -151,7 +151,7 @@
Deque<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> m_pendingConnectionReplies;
Vector<uint64_t> m_pendingFetchWebsiteDataRequests;
- HashMap<uint64_t, WTF::Function<void (Vector<String>)>> m_pendingFetchWebsiteDataCallbacks;
+ HashMap<uint64_t, CompletionHandler<void (Vector<String>)>> m_pendingFetchWebsiteDataCallbacks;
struct DeleteWebsiteDataRequest {
WallTime modifiedSince;
@@ -158,7 +158,7 @@
uint64_t callbackID;
};
Vector<DeleteWebsiteDataRequest> m_pendingDeleteWebsiteDataRequests;
- HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+ HashMap<uint64_t, CompletionHandler<void ()>> m_pendingDeleteWebsiteDataCallbacks;
struct DeleteWebsiteDataForHostNamesRequest {
Vector<String> hostNames;
@@ -165,7 +165,7 @@
uint64_t callbackID;
};
Vector<DeleteWebsiteDataForHostNamesRequest> m_pendingDeleteWebsiteDataForHostNamesRequests;
- HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataForHostNamesCallbacks;
+ HashMap<uint64_t, CompletionHandler<void ()>> m_pendingDeleteWebsiteDataForHostNamesCallbacks;
// If createPluginConnection is called while the process is still launching we'll keep count of it and send a bunch of requests
// when the process finishes launching.
Modified: trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp 2018-07-26 16:15:30 UTC (rev 234261)
@@ -102,7 +102,7 @@
}
}
-void StorageProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler)
+void StorageProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, CompletionHandler<void (WebsiteData)>&& completionHandler)
{
ASSERT(canSendMessage());
@@ -112,7 +112,7 @@
send(Messages::StorageProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
}
-void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, WTF::Function<void ()>&& completionHandler)
+void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
{
auto callbackID = generateCallbackID();
@@ -120,7 +120,7 @@
send(Messages::StorageProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
}
-void StorageProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, WTF::Function<void()>&& completionHandler)
+void StorageProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, CompletionHandler<void()>&& completionHandler)
{
ASSERT(canSendMessage());
Modified: trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h 2018-07-26 16:15:30 UTC (rev 234261)
@@ -52,9 +52,9 @@
static Ref<StorageProcessProxy> create(WebProcessPool&);
~StorageProcessProxy();
- void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WTF::Function<void(WebsiteData)>&& completionHandler);
- void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, WTF::Function<void()>&& completionHandler);
- void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, WTF::Function<void()>&& completionHandler);
+ void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, CompletionHandler<void(WebsiteData)>&&);
+ void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, CompletionHandler<void()>&&);
+ void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, CompletionHandler<void()>&&);
void getStorageProcessConnection(WebProcessProxy&, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&&);
@@ -95,9 +95,9 @@
unsigned m_numPendingConnectionRequests;
Deque<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply> m_pendingConnectionReplies;
- HashMap<uint64_t, WTF::Function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
- HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
- HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
+ HashMap<uint64_t, CompletionHandler<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
+ HashMap<uint64_t, CompletionHandler<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+ HashMap<uint64_t, CompletionHandler<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2018-07-26 16:15:30 UTC (rev 234261)
@@ -248,13 +248,13 @@
return globalPageMap().get(pageID);
}
-void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, Function<void (const HashSet<String>&)>&& completionHandler)
+void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, CompletionHandler<void (const HashSet<String>&)>&& completionHandler)
{
// We expect this to be called on the main thread so we get the default website data store.
ASSERT(RunLoop::isMain());
struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
- explicit CallbackAggregator(Function<void(HashSet<String>)>&& completionHandler)
+ explicit CallbackAggregator(CompletionHandler<void(HashSet<String>)>&& completionHandler)
: completionHandler(WTFMove(completionHandler))
{
}
@@ -283,7 +283,7 @@
}
unsigned pendingCallbacks = 0;
- Function<void(HashSet<String>)> completionHandler;
+ CompletionHandler<void(HashSet<String>)> completionHandler;
HashSet<String> domainsWithDeletedWebsiteData;
};
@@ -310,13 +310,13 @@
}
}
-void WebProcessProxy::topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, Function<void(HashSet<String>&&)>&& completionHandler)
+void WebProcessProxy::topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, CompletionHandler<void(HashSet<String>&&)>&& completionHandler)
{
// We expect this to be called on the main thread so we get the default website data store.
ASSERT(RunLoop::isMain());
struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
- explicit CallbackAggregator(Function<void(HashSet<String>&&)>&& completionHandler)
+ explicit CallbackAggregator(CompletionHandler<void(HashSet<String>&&)>&& completionHandler)
: completionHandler(WTFMove(completionHandler))
{
}
@@ -346,7 +346,7 @@
}
unsigned pendingCallbacks = 0;
- Function<void(HashSet<String>&&)> completionHandler;
+ CompletionHandler<void(HashSet<String>&&)> completionHandler;
HashSet<String> domainsWithDeletedWebsiteData;
};
@@ -923,7 +923,7 @@
page->activityStateDidChange(ActivityState::IsVisuallyIdle);
}
-void WebProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, Function<void(WebsiteData)>&& completionHandler)
+void WebProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, CompletionHandler<void(WebsiteData)>&& completionHandler)
{
ASSERT(canSendMessage());
@@ -945,7 +945,7 @@
});
}
-void WebProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, Function<void()>&& completionHandler)
+void WebProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void()>&& completionHandler)
{
ASSERT(canSendMessage());
@@ -962,7 +962,7 @@
});
}
-void WebProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, Function<void()>&& completionHandler)
+void WebProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, CompletionHandler<void()>&& completionHandler)
{
ASSERT(canSendMessage());
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (234260 => 234261)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2018-07-26 16:01:04 UTC (rev 234260)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2018-07-26 16:15:30 UTC (rev 234261)
@@ -158,11 +158,11 @@
void didSaveToPageCache();
void releasePageCache();
- void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, Function<void(WebsiteData)>&& completionHandler);
- void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, Function<void()>&& completionHandler);
- void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, Function<void()>&& completionHandler);
- static void deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPages, Function<void (const HashSet<String>&)>&& completionHandler);
- static void topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, Function<void(HashSet<String>&&)>&& completionHandler);
+ void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, CompletionHandler<void(WebsiteData)>&&);
+ void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, CompletionHandler<void()>&&);
+ void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, CompletionHandler<void()>&&);
+ static void deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPages, CompletionHandler<void (const HashSet<String>&)>&&);
+ static void topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, CompletionHandler<void(HashSet<String>&&)>&&);
static void notifyPageStatisticsAndDataRecordsProcessed();
static void notifyPageStatisticsTelemetryFinished(API::Object* messageBody);
