Changeset 218116 in webkit

Timestamp:

Jun 12, 2017, 11:49:06 AM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Cherry-pick r218002. rdar://problem/32679311

Location:

tags/Safari-604.1.25/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (2 diffs)

tags/Safari-604.1.25/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-12  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Cherry-pick r218002. rdar://problem/32679311
+
+    2017-06-09  Chris Dumez  <cdumez@apple.com>
+
+            Avoid some ref counting churn in WebResourceLoadStatisticsStore
+            https://bugs.webkit.org/show_bug.cgi?id=173168
+
+            Reviewed by Brent Fulgham.
+
+            Move the protectedThis around instead of ref'ing it every time we capture it
+            in a lambda. Also add a missing protectedThis in WebResourceLoadStatisticsStore::removeDataRecords()
+            which likely fixes crashes.
+
+            * UIProcess/WebResourceLoadStatisticsStore.cpp:
+            (WebKit::WebResourceLoadStatisticsStore::removeDataRecords):
+            (WebKit::WebResourceLoadStatisticsStore::grandfatherExistingWebsiteData):
+
 2017-06-12  Matthew Hanson  <matthew_hanson@apple.com>
 

tags/Safari-604.1.25/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -210 +210 @@
 }
 
-void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, std::function<void(Vector<String>)> completionHandler)
+void WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPage, Function<void(Vector<String>)>&& completionHandler)
 {
     struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
-        explicit CallbackAggregator(std::function<void(Vector<String>)> completionHandler)
+        explicit CallbackAggregator(Function<void(Vector<String>)>&& completionHandler)
             : completionHandler(WTFMove(completionHandler))
         {
@@ -242 +242 @@
         
         unsigned pendingCallbacks = 0;
-        std::function<void(Vector<String>)> completionHandler;
+        Function<void(Vector<String>)> completionHandler;
         Vector<String> domainsWithDeletedWebsiteData;
     };

tags/Safari-604.1.25/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -142 +142 @@
     void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, Function<void()> completionHandler);
     void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, Function<void()> completionHandler);
-    static void deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPages, std::function<void(Vector<String>)> completionHandler);
+    static void deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>&& topPrivatelyControlledDomains, bool shouldNotifyPages, Function<void(Vector<String>)>&& completionHandler);
     static void topPrivatelyControlledDomainsWithWebiteData(OptionSet<WebsiteDataType> dataTypes, bool shouldNotifyPage, Function<void(HashSet<String>&&)> completionHandler);
     static void notifyPageStatisticsAndDataRecordsProcessed();

tags/Safari-604.1.25/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -120 +120 @@
     // Switch to the main thread to get the default website data store
     RunLoop::main().dispatch([prevalentResourceDomains = CrossThreadCopier<Vector<String>>::copy(prevalentResourceDomains), this, protectedThis = makeRef(*this)] () mutable {
-        WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(dataTypesToRemove, WTFMove(prevalentResourceDomains), notifyPages, [this](Vector<String> domainsWithDeletedWebsiteData) mutable {
+        WebProcessProxy::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores(dataTypesToRemove, WTFMove(prevalentResourceDomains), notifyPages, [this, protectedThis = WTFMove(protectedThis)](Vector<String> domainsWithDeletedWebsiteData) mutable {
             // But always touch the ResourceLoadStatistics store on the worker queue.
-            m_statisticsQueue->dispatch([this, protectedThis = makeRef(*this), topDomains = CrossThreadCopier<Vector<String>>::copy(domainsWithDeletedWebsiteData)] () mutable {
-                this->coreStore().updateStatisticsForRemovedDataRecords(topDomains);
-                this->coreStore().dataRecordsWereRemoved();
+            m_statisticsQueue->dispatch([protectedThis = WTFMove(protectedThis), topDomains = CrossThreadCopier<Vector<String>>::copy(domainsWithDeletedWebsiteData)] () mutable {
+                protectedThis->coreStore().updateStatisticsForRemovedDataRecords(topDomains);
+                protectedThis->coreStore().dataRecordsWereRemoved();
             });
         });
@@ -216 +216 @@
     // Switch to the main thread to get the default website data store
     RunLoop::main().dispatch([this, protectedThis = makeRef(*this)] () mutable {
-        WebProcessProxy::topPrivatelyControlledDomainsWithWebiteData(dataTypesToRemove, notifyPages, [this, protectedThis = makeRef(*this)] (HashSet<String>&& topPrivatelyControlledDomainsWithWebsiteData) mutable {
+        WebProcessProxy::topPrivatelyControlledDomainsWithWebiteData(dataTypesToRemove, notifyPages, [this, protectedThis = WTFMove(protectedThis)] (HashSet<String>&& topPrivatelyControlledDomainsWithWebsiteData) mutable {
             // But always touch the ResourceLoadStatistics store on the worker queue
-            m_statisticsQueue->dispatch([this, protectedThis = makeRef(*this), topDomains = CrossThreadCopier<HashSet<String>>::copy(topPrivatelyControlledDomainsWithWebsiteData)] () mutable {
-                this->coreStore().handleFreshStartWithEmptyOrNoStore(WTFMove(topDomains));
+            m_statisticsQueue->dispatch([protectedThis = WTFMove(protectedThis), topDomains = CrossThreadCopier<HashSet<String>>::copy(topPrivatelyControlledDomainsWithWebsiteData)] () mutable {
+                protectedThis->coreStore().handleFreshStartWithEmptyOrNoStore(WTFMove(topDomains));
             });
         });