From 9bc7139cacfa522d9d63dbeb069fe9beceacb19a Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Tue, 16 Jun 2020 17:41:05 -0700 Subject: [PATCH] browser(webkit): fix windows and mac unified builds after roll (#2595) --- browser_patches/webkit/BUILD_NUMBER | 2 +- browser_patches/webkit/patches/bootstrap.diff | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index e92ce6291e..b2cff281f9 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1283 +1284 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 24cfb6d4c8..88e7b25796 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -7375,10 +7375,18 @@ index 1d2febfba8833912f72216aa53c8c20090ee2d8b..1b2c3d84b15b12f1a187c0b7622db43c #ifdef __cplusplus diff --git a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp -index be5030797402d00ba0e0bc371e52c8c1d47b1ca1..c9765685d5197b87a26371bf50f55122340f1bd3 100644 +index be5030797402d00ba0e0bc371e52c8c1d47b1ca1..eb61db48a546955f39c10b4dfa631a198539ac09 100644 --- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp +++ b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp -@@ -633,7 +633,7 @@ void WKWebsiteDataStoreSetResourceLoadStatisticsToSameSiteStrictCookiesForTestin +@@ -31,6 +31,7 @@ + #include "ShouldGrandfatherStatistics.h" + #include "WKAPICast.h" + #include "WKDictionary.h" ++#include "WKMutableArray.h" + #include "WKNumber.h" + #include "WKRetainPtr.h" + #include "WKSecurityOriginRef.h" +@@ -633,7 +634,7 @@ void WKWebsiteDataStoreSetResourceLoadStatisticsToSameSiteStrictCookiesForTestin void WKWebsiteDataStoreSetAppBoundDomainsForTesting(WKArrayRef originURLsRef, void* context, WKWebsiteDataStoreSetAppBoundDomainsForTestingFunction completionHandler) { #if PLATFORM(COCOA) @@ -7387,6 +7395,15 @@ index be5030797402d00ba0e0bc371e52c8c1d47b1ca1..c9765685d5197b87a26371bf50f55122 size_t newSize = originURLsArray ? originURLsArray->size() : 0; HashSet domains; domains.reserveInitialCapacity(newSize); +@@ -824,7 +825,7 @@ void WKWebsiteDataStoreClearBundleIdentifierInNetworkProcess(WKWebsiteDataStoreR + void WKWebsiteDataStoreGetAllStorageAccessEntries(WKWebsiteDataStoreRef dataStoreRef, WKPageRef pageRef, void* context, WKWebsiteDataStoreGetAllStorageAccessEntriesFunction callback) + { + #if ENABLE(RESOURCE_LOAD_STATISTICS) +- WebKit::toImpl(dataStoreRef)->getAllStorageAccessEntries(toImpl(pageRef)->identifier(), [context, callback] (Vector&& domains) { ++ WebKit::toImpl(dataStoreRef)->getAllStorageAccessEntries(WebKit::toImpl(pageRef)->identifier(), [context, callback] (Vector&& domains) { + auto domainArrayRef = WKMutableArrayCreate(); + for (auto domain : domains) + WKArrayAppendItem(domainArrayRef, adoptWK(WKStringCreateWithUTF8CString(domain.utf8().data())).get()); diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm b/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm index 7b9469ee130d1b62c8b8187bd25748b42c40a352..dab2ff1ebaa7a9c13efe5ae75779f1c8efe19fc0 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm