Changeset 236233 in webkit

Timestamp:

Sep 19, 2018, 5:20:05 PM (8 years ago)

Author:

realdawei@apple.com

Message:

Unreviewed, rolling out r236229.

caused API timouts on mac and ios

Reverted changeset:

"Clear persistent storage between tests for
resourceLoadStatistics"
​https://bugs.webkit.org/show_bug.cgi?id=189684
​https://trac.webkit.org/changeset/236229

Patch by Dawei Fenton <​realdawei@apple.com> on 2018-09-19

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKWebsiteDataStoreRef.cpp (modified) (1 diff)
• UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-19  Dawei Fenton  <realdawei@apple.com>
+
+        Unreviewed, rolling out r236229.
+
+        caused API timouts on mac and ios
+
+        Reverted changeset:
+
+        "Clear persistent storage between tests for
+        resourceLoadStatistics"
+        https://bugs.webkit.org/show_bug.cgi?id=189684
+        https://trac.webkit.org/changeset/236229
+
 2018-09-19  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

@@ -485 +485 @@
 
     statisticsStore->resetParametersToDefaultValues([callbackAggregator = callbackAggregator.copyRef()] { });
-    statisticsStore->scheduleClearInMemoryAndPersistent(WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::No, [callbackAggregator = callbackAggregator.copyRef()] { });
+    statisticsStore->scheduleClearInMemory([callbackAggregator = callbackAggregator.copyRef()] { });
 }
 

trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -760 +760 @@
 #endif
 
+void WebResourceLoadStatisticsStore::scheduleClearInMemory(CompletionHandler<void()>&& completionHandler)
+{
+    ASSERT(RunLoop::isMain());
+    postTask([this, completionHandler = WTFMove(completionHandler)]() mutable {
+
+        CompletionHandler<void()> callCompletionHandlerOnMainThread = [completionHandler = WTFMove(completionHandler)]() mutable {
+            postTaskReply(WTFMove(completionHandler));
+        };
+
+        if (!m_memoryStore) {
+            callCompletionHandlerOnMainThread();
+            return;
+        }
+
+        m_memoryStore->clear(WTFMove(callCompletionHandlerOnMainThread));
+    });
+}
+
 void WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent(ShouldGrandfather shouldGrandfather, CompletionHandler<void()>&& completionHandler)
 {
     ASSERT(RunLoop::isMain());
-    postTask([this, protectedThis = makeRef(*this), shouldGrandfather, completionHandler = WTFMove(completionHandler)] () mutable {
+    postTask([this, shouldGrandfather, completionHandler = WTFMove(completionHandler)] () mutable {
+        if (m_memoryStore)
+            m_memoryStore->clear([] { });
         if (m_persistentStorage)
             m_persistentStorage->clear();
-
-        CompletionHandlerCallingScope completionHandlerCaller([completionHandler = WTFMove(completionHandler)]() mutable {
+        
+        CompletionHandler<void()> callCompletionHandlerOnMainThread = [completionHandler = WTFMove(completionHandler)]() mutable {
             postTaskReply(WTFMove(completionHandler));
-        });
-
-        if (m_memoryStore) {
-            m_memoryStore->clear([this, protectedThis = protectedThis.copyRef(), shouldGrandfather, completionHandlerCaller = WTFMove(completionHandlerCaller)] () mutable {
-                if (shouldGrandfather == ShouldGrandfather::Yes) {
-                    if (m_memoryStore)
-                        m_memoryStore->grandfatherExistingWebsiteData(completionHandlerCaller.release());
-                    else
-                        RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent After being cleared, m_memoryStore is null when trying to grandfather data.");
-                }
-            });
-        } else {
-            if (shouldGrandfather == ShouldGrandfather::Yes)
-                RELEASE_LOG(ResourceLoadStatistics, "WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent Before being cleared, m_memoryStore is null when trying to grandfather data.");
-        }
+        };
+
+        if (shouldGrandfather == ShouldGrandfather::Yes && m_memoryStore)
+            m_memoryStore->grandfatherExistingWebsiteData(WTFMove(callCompletionHandlerOnMainThread));
+        else
+            callCompletionHandlerOnMainThread();
     });
 }