Title: [218769] trunk/Source/WebKit2
- Revision
- 218769
- Author
- [email protected]
- Date
- 2017-06-23 15:50:04 -0700 (Fri, 23 Jun 2017)
Log Message
Stop passing Vector by value in WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores()
https://bugs.webkit.org/show_bug.cgi?id=173782
Reviewed by Brent Fulgham.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores):
* UIProcess/WebProcessProxy.h:
* UIProcess/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::removeDataRecords):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (218768 => 218769)
--- trunk/Source/WebKit2/ChangeLog 2017-06-23 22:10:27 UTC (rev 218768)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-23 22:50:04 UTC (rev 218769)
@@ -1,5 +1,18 @@
2017-06-23 Chris Dumez <[email protected]>
+ Stop passing Vector by value in WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores()
+ https://bugs.webkit.org/show_bug.cgi?id=173782
+
+ Reviewed by Brent Fulgham.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::removeDataRecords):
+
+2017-06-23 Chris Dumez <[email protected]>
+
Avoid copying HashSet to Vector in WebPageProxy::clearLoadDependentCallbacks()
https://bugs.webkit.org/show_bug.cgi?id=173786
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (218768 => 218769)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-23 22:10:27 UTC (rev 218768)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-23 22:50:04 UTC (rev 218769)
@@ -209,7 +209,7 @@
return globalPageMap().get(pageID);
}
-void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, Function<void(Vector<String>)>&& completionHandler)
+void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, Function<void (const Vector<String>&)>&& completionHandler)
{
// We expect this to be called on the main thread so we get the default website data store.
ASSERT(RunLoop::isMain());
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (218768 => 218769)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-06-23 22:10:27 UTC (rev 218768)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-06-23 22:50:04 UTC (rev 218769)
@@ -141,7 +141,7 @@
void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, Function<void(WebsiteData)>&& completionHandler);
void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, Function<void()>&& completionHandler);
void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, Function<void()>&& completionHandler);
- static void deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPages, Function<void(Vector<String>)>&& completionHandler);
+ static void deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPages, Function<void (const Vector<String>&)>&& completionHandler);
static void topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, Function<void(HashSet<String>&&)>&& completionHandler);
static void notifyPageStatisticsAndDataRecordsProcessed();
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (218768 => 218769)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-06-23 22:10:27 UTC (rev 218768)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-06-23 22:50:04 UTC (rev 218769)
@@ -119,7 +119,7 @@
// Switch to the main thread to get the default website data store
RunLoop::main().dispatch([prevalentResourceDomains = CrossThreadCopier<Vector<String>>::copy(prevalentResourceDomains), this, protectedThis = makeRef(*this)] () mutable {
- WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(dataTypesToRemove, WTFMove(prevalentResourceDomains), notifyPages, [this, protectedThis = WTFMove(protectedThis)](Vector<String> domainsWithDeletedWebsiteData) mutable {
+ WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(dataTypesToRemove, WTFMove(prevalentResourceDomains), notifyPages, [this, protectedThis = WTFMove(protectedThis)](const Vector<String>& domainsWithDeletedWebsiteData) mutable {
// But always touch the ResourceLoadStatistics store on the worker queue.
m_statisticsQueue->dispatch([protectedThis = WTFMove(protectedThis), topDomains = CrossThreadCopier<Vector<String>>::copy(domainsWithDeletedWebsiteData)] () mutable {
protectedThis->coreStore().updateStatisticsForRemovedDataRecords(topDomains);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
