Attachment 342952 Details for Bug 186777 – Patch

[patch] Patch

bug-186777-20180618105751.patch (text/plain), 3.93 KB, created by John Wilander on 2018-06-18 10:57:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2018-06-18 10:57:52 PDT

Size: 3.93 KB

patch

obsolete

>Subversion Revision: 232932
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d2f64247e3e6dcdd2a3c77854328e32121a25629..c5ce3adbf26ded24832b2f664a1a4ca4452bb94a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-18  John Wilander  <wilander@apple.com>
>+
>+        Resource Load Statistics: Make sure to call callbacks even if there is no store (test infrastructure)
>+        https://bugs.webkit.org/show_bug.cgi?id=186777
>+        <rdar://problem/41216181>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
>+        (WKWebsiteDataStoreStatisticsUpdateCookiePartitioning):
>+        (WKWebsiteDataStoreSetStatisticsShouldPartitionCookiesForHost):
>+        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
>+        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
>+
> 2018-06-18  Karl Leplat  <karl.leplat_ext@softathome.com>
> 
>         [Threaded paintingEngine] Fix rendering glitches
>diff --git a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>index 795c3634fab5cd6610b60201cf03412b29955e7e..2e99929f2c8982a6022f5622df8362ad9a9c1c8d 100644
>--- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>@@ -293,8 +293,10 @@ void WKWebsiteDataStoreStatisticsProcessStatisticsAndDataRecords(WKWebsiteDataSt
> void WKWebsiteDataStoreStatisticsUpdateCookiePartitioning(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsUpdateCookiePartitioningFunction callback)
> {
>     auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>-    if (!store)
>+    if (!store) {
>+        callback(context);
>         return;
>+    }
> 
>     store->scheduleCookiePartitioningUpdate([context, callback]() {
>         callback(context);
>@@ -304,8 +306,10 @@ void WKWebsiteDataStoreStatisticsUpdateCookiePartitioning(WKWebsiteDataStoreRef
> void WKWebsiteDataStoreSetStatisticsShouldPartitionCookiesForHost(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, bool value, void* context, WKWebsiteDataStoreSetStatisticsShouldPartitionCookiesForHostFunction callback)
> {
>     auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>-    if (!store)
>+    if (!store) {
>+        callback(context);
>         return;
>+    }
> 
>     if (value)
>         store->scheduleCookiePartitioningUpdateForDomains({ WebKit::toImpl(host)->string() }, { }, { }, WebKit::ShouldClearFirst::No, [context, callback]() {
>@@ -388,8 +392,10 @@ void WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo(WKWebsiteDataStoreRef dat
> void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback)
> {
>     auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>-    if (!store)
>+    if (!store) {
>+        callback(context);
>         return;
>+    }
> 
>     store->scheduleClearInMemoryAndPersistent(WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::Yes, [context, callback]() {
>         callback(context);
>@@ -399,8 +405,10 @@ void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataSt
> void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback)
> {
>     auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>-    if (!store)
>+    if (!store) {
>+        callback(context);
>         return;
>+    }
> 
>     store->scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::Yes, [context, callback]() {
>         callback(context);

Actions: View | Formatted Diff | Diff

Attachments on bug 186777: 342952