Title: [263568] trunk/Source/WebKit
- Revision
- 263568
- Author
- [email protected]
- Date
- 2020-06-26 10:16:24 -0700 (Fri, 26 Jun 2020)
Log Message
[WinCairo] Cannot build without resource load statistics
https://bugs.webkit.org/show_bug.cgi?id=213534
Reviewed by Don Olmstead.
Build fix for !ENABLE(RESOURCE_LOAD_STATISTICS)
* UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (263567 => 263568)
--- trunk/Source/WebKit/ChangeLog 2020-06-26 17:00:50 UTC (rev 263567)
+++ trunk/Source/WebKit/ChangeLog 2020-06-26 17:16:24 UTC (rev 263568)
@@ -1,3 +1,15 @@
+2020-06-26 Stephan Szabo <[email protected]>
+
+ [WinCairo] Cannot build without resource load statistics
+ https://bugs.webkit.org/show_bug.cgi?id=213534
+
+ Reviewed by Don Olmstead.
+
+ Build fix for !ENABLE(RESOURCE_LOAD_STATISTICS)
+
+ * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+
2020-06-25 Alex Christensen <[email protected]>
WKHTTPCookieStore.setCookie should flush the cookies to disk before calling completion handler when we are using the UIProcess's default cookie storage
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (263567 => 263568)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2020-06-26 17:00:50 UTC (rev 263567)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2020-06-26 17:16:24 UTC (rev 263568)
@@ -70,6 +70,7 @@
void WKWebsiteDataStoreRemoveITPDataForDomain(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, void* context, WKWebsiteDataStoreRemoveITPDataForDomainFunction callback)
{
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
WebKit::WebsiteDataRecord dataRecord;
dataRecord.types.add(WebKit::WebsiteDataType::ResourceLoadStatistics);
dataRecord.addResourceLoadStatisticsRegistrableDomain(WebCore::RegistrableDomain::uncheckedCreateFromHost(WebKit::toImpl(host)->string()));
@@ -79,6 +80,9 @@
WebKit::toImpl(dataStoreRef)->removeData(dataTypes, dataRecords, [context, callback] {
callback(context);
});
+#else
+ callback(context);
+#endif
}
void WKWebsiteDataStoreDoesStatisticsDomainIDExistInDatabase(WKWebsiteDataStoreRef dataStoreRef, int domainID, void* context, WKWebsiteDataStoreDoesStatisticsDomainIDExistInDatabaseFunction callback)
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (263567 => 263568)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-06-26 17:00:50 UTC (rev 263567)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2020-06-26 17:16:24 UTC (rev 263568)
@@ -1010,8 +1010,10 @@
cookieHostNames.append(hostName);
for (auto& hostName : dataRecord.HSTSCacheHostNames)
HSTSCacheHostNames.append(hostName);
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
for (auto& registrableDomain : dataRecord.resourceLoadStatisticsRegistrableDomains)
registrableDomains.append(registrableDomain);
+#endif
}
callbackAggregator->addPendingCallback();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
