Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (226856 => 226857)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-12 04:52:53 UTC (rev 226856)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-12 04:52:55 UTC (rev 226857)
@@ -1,5 +1,23 @@
2018-01-11 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r226742. rdar://problem/36429136
+
+ 2018-01-10 Brent Fulgham <bfulg...@apple.com>
+
+ 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-11 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r226644. rdar://problem/36429133
2018-01-09 Paul Knight <pkni...@apple.com>
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (226856 => 226857)
--- branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-01-12 04:52:53 UTC (rev 226856)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-01-12 04:52:55 UTC (rev 226857)
@@ -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));
