Attachment 345799 Details for Bug 188027 – Patch

[patch] Patch

bug-188027-20180725162520.patch (text/plain), 22.60 KB, created by Chris Dumez on 2018-07-25 16:25:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-07-25 16:25:21 PDT

Size: 22.60 KB

patch

obsolete

>Subversion Revision: 234214
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 519c7e498ff1bca77f1e5868b9ad96fa97bd0bb1..78e7f2d83d6154c1300e16d2534a21eefd6aa853 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,36 @@
>+2018-07-25  Chris Dumez  <cdumez@apple.com>
>+
>+        WebSiteData-related methods should take in CompletionHandlers instead of Functions
>+        https://bugs.webkit.org/show_bug.cgi?id=188027
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-25  Tim Horton  <timothy_horton@apple.com>
> 
>         Fix the build.
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>index 92e613fd6024caa4426fe188377698dfb9f2ddb2..fe53322db0d03546bbc49a1021d1a5df710e4a5a 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>@@ -143,7 +143,7 @@ DownloadProxy* NetworkProcessProxy::createDownloadProxy(const ResourceRequest& r
>     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 @@ void NetworkProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<W
>     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 @@ void NetworkProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<
>     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());
> 
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
>index fefd73ec4d39447524e1275e6ad80912c71c6c3a..3698fc611123ab816c2090247a09076362229706 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
>@@ -73,9 +73,9 @@ public:
> 
>     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 @@ private:
>     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)
>diff --git a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>index 326ae2a749e9047f6c0944e2c0640bd73c48f73d..96bd1ea62548785f6881c79254b71f1970c06e88 100644
>--- a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>@@ -113,7 +113,7 @@ void PluginProcessProxy::getPluginProcessConnection(Messages::WebProcessProxy::G
>     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 @@ void PluginProcessProxy::fetchWebsiteData(WTF::Function<void (Vector<String>)>&&
>     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 @@ void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, WTF::Function
>     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));
>diff --git a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h
>index 9e86b85ba375b0abc3a81a30634ed3a23dfd3d03..09600b1214847f20600892f2f54d93dc0c9a4e88 100644
>--- a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h
>+++ b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h
>@@ -78,9 +78,9 @@ public:
>     // 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,21 +151,21 @@ private:
>     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;
>         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;
>         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.
>diff --git a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>index a691fb4bc7d8cafe150b290b71ae41287e44595c..eb6605348ef831cf131a80f096aa7323f4317b23 100644
>--- a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>@@ -102,7 +102,7 @@ void StorageProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::De
>     }
> }
> 
>-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 @@ void StorageProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<W
>     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 @@ void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<
>     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());
> 
>diff --git a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
>index 9cdd3ed3d006886c71b27c4045f0dd4b525fe0a2..afc38446c91a2978d194bc3fb45df47ba7de0425 100644
>--- a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
>+++ b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
>@@ -52,9 +52,9 @@ public:
>     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 @@ private:
>     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
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
>index 84ab5fcd1046d768337fcc106f42f68fa6c207d1..8180bcc14b49d7b346bb5466b83c909890046312 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
>@@ -248,13 +248,13 @@ WebPageProxy* WebProcessProxy::webPage(uint64_t pageID)
>     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 @@ void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPers
>         }
>         
>         unsigned pendingCallbacks = 0;
>-        Function<void(HashSet<String>)> completionHandler;
>+        CompletionHandler<void(HashSet<String>)> completionHandler;
>         HashSet<String> domainsWithDeletedWebsiteData;
>     };
>     
>@@ -310,13 +310,13 @@ void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPers
>     }
> }
> 
>-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 @@ void WebProcessProxy::topPrivatelyControlledDomainsWithWebsiteData(OptionSet<Web
>         }
>         
>         unsigned pendingCallbacks = 0;
>-        Function<void(HashSet<String>&&)> completionHandler;
>+        CompletionHandler<void(HashSet<String>&&)> completionHandler;
>         HashSet<String> domainsWithDeletedWebsiteData;
>     };
>     
>@@ -923,7 +923,7 @@ void WebProcessProxy::windowServerConnectionStateChanged()
>         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::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<Websi
>     });
> }
> 
>-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::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<Webs
>     });
> }
> 
>-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());
> 
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
>index 096affbe8aab328aba903afb4c84a5a9460af8b8..6c18e8666ade10c487b6f667656be657917d30c2 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.h
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
>@@ -158,11 +158,11 @@ public:
>     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);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188027: 345799