Changeset 240247 in webkit

Timestamp:

Jan 21, 2019 5:55:47 PM (5 years ago)

Author:

Brent Fulgham

Message:

Unreviewed test fix after r240243
Nhttps://bugs.webkit.org/show_bug.cgi?id=193660
<rdar://problem/47433602>

The new ResourceLoadStatistics section of 'removeData' was incrementing the
pending callback count before deciding whether to send a message to delete
data. This left the count out-of-balance leading to the operation never
completing.

This patch also prevents sending a second message to the NetworkProcess
requesting data be deleted if the message was already sent in an earlier
section of the method (e.g., as typically happens when all website data
is being deleted).

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::removeData):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-21  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed test fix after r240243
+        Nhttps://bugs.webkit.org/show_bug.cgi?id=193660
+        <rdar://problem/47433602>
+
+        The new ResourceLoadStatistics section of 'removeData' was incrementing the
+        pending callback count before deciding whether to send a message to delete
+        data. This left the count out-of-balance leading to the operation never
+        completing.
+
+        This patch also prevents sending a second message to the NetworkProcess
+        requesting data be deleted if the message was already sent in an earlier
+        section of the method (e.g., as typically happens when all website data
+        is being deleted).
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::removeData):
+
 2019-01-21  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -758 +758 @@
 #endif
 
+    bool didNotifyNetworkProcessToDeleteWebsiteData = false;
     auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
     if (networkProcessAccessType != ProcessAccessType::None) {
@@ -779 +780 @@
                 callbackAggregator->removePendingCallback();
             });
+            didNotifyNetworkProcessToDeleteWebsiteData = true;
         }
     }
@@ -939 +941 @@
         auto shouldGrandfather = ((monitoredTypesRaw & deletedTypesRaw) == monitoredTypesRaw) ? ShouldGrandfather::No : ShouldGrandfather::Yes;
         
-        callbackAggregator->addPendingCallback();
-
         if (m_resourceLoadStatistics) {
+            callbackAggregator->addPendingCallback();
             m_resourceLoadStatistics->scheduleClearInMemoryAndPersistent(modifiedSince, shouldGrandfather, [callbackAggregator] {
                 callbackAggregator->removePendingCallback();
             });
-        } else {
+        } else if (!didNotifyNetworkProcessToDeleteWebsiteData) {
             for (auto& processPool : processPools()) {
                 if (auto* process = processPool->networkProcess()) {
+                    callbackAggregator->addPendingCallback();
                     process->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator] {
                         callbackAggregator->removePendingCallback();