Attachment 349837 Details for Bug 189632 – Patch

[patch] Patch

bug-189632-20180914173325.patch (text/plain), 2.44 KB, created by Woodrow Wang on 2018-09-14 17:33:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Woodrow Wang

Created: 2018-09-14 17:33:26 PDT

Size: 2.44 KB

patch

obsolete

>Subversion Revision: 236026
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8eb4fcff090cb588da65f1b04b867610c66c9e0b..5b1d30cf3c6e9519b71c23ad92ab8b5a1eae89db 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-14  Woodrow Wang  <woodrow_wang@apple.com>
>+
>+        Clear pending resource load statistics' writes after tests
>+        https://bugs.webkit.org/show_bug.cgi?id=189632
>+        <rdar://problem/44469275>
>+
>+        Reviewed by Chris Dumez.
>+
>+        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
>+        (WKWebsiteDataStoreStatisticsResetToConsistentState):
>+
> 2018-09-10  Woodrow Wang  <woodrow_wang@apple.com>
> 
>         Add Web API Statistics Collection
>diff --git a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>index 68a1658126d1ad24f045792055a54119f5bf1edd..7f23e90ff7c6e2ce4d54792c64a0b9623f2efe83 100644
>--- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>@@ -464,16 +464,19 @@ void WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval(WKWebsiteDataSto
> 
> void WKWebsiteDataStoreStatisticsResetToConsistentState(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsResetToConsistentStateFunction completionHandler)
> {
>-    auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>-    if (!store)
>-        return;
>-
>     auto callbackAggregator = CallbackAggregator::create([context, completionHandler]() {
>         completionHandler(context);
>     });
>-    
>-    store->resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });
>-    store->scheduleClearInMemory([callbackAggregator = callbackAggregator.copyRef()] { });
>+
>+    auto& store = WebKit::toImpl(dataStoreRef)->websiteDataStore();
>+    store.clearResourceLoadStatisticsInWebProcesses([callbackAggregator = callbackAggregator.copyRef()] { });
>+
>+    auto* statisticsStore = store.resourceLoadStatistics();
>+    if (!statisticsStore)
>+        return;
>+
>+    statisticsStore->resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });
>+    statisticsStore->scheduleClearInMemory([callbackAggregator = callbackAggregator.copyRef()] { });
> }
> 
> void WKWebsiteDataStoreRemoveAllFetchCaches(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreRemoveFetchCacheRemovalFunction callback)

Actions: View | Formatted Diff | Diff

Attachments on bug 189632: 349808 | 349833 | 349837