Modified: trunk/Source/WebKit/ChangeLog (226741 => 226742)
--- trunk/Source/WebKit/ChangeLog 2018-01-10 23:41:36 UTC (rev 226741)
+++ trunk/Source/WebKit/ChangeLog 2018-01-11 00:06:55 UTC (rev 226742)
@@ -1,3 +1,17 @@
+2018-01-10 Brent Fulgham <[email protected]>
+
+ Use protectedThis for the 'updatePrevalentDomainsToPartitionOrBlockCookies' lambda
+ https://bugs.webkit.org/show_bug.cgi?id=181452
+ <rdar://problem/36416912>
+
+ Reviewed by Chris Dumez.
+
+ We forgot to use a 'protectedThis' back in r225006 for one of the lambdas used by
+ the WebsiteDataStore for processing.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback):
+
2018-01-09 John Wilander <[email protected]>
Storage Access API: Turn feature on by default in WebPreferences.yaml
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (226741 => 226742)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-01-10 23:41:36 UTC (rev 226741)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-01-11 00:06:55 UTC (rev 226742)
@@ -1401,7 +1401,7 @@
}
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
- m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), [this] (const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst) {
+ m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), [this, protectedThis = makeRef(*this)] (const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst) {
updatePrevalentDomainsToPartitionOrBlockCookies(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst);
}, [this, protectedThis = makeRef(*this)] (const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void(bool hasAccess)>&& callback) {
hasStorageAccessForFrameHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(callback));