Attachment 360634 Details for Bug 194054 – Patch

[patch] Patch

bug-194054-20190130153723.patch (text/plain), 2.98 KB, created by Chris Dumez on 2019-01-30 15:37:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-01-30 15:37:24 PST

Size: 2.98 KB

patch

obsolete

>Subversion Revision: 240731
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1719403c527fc4ecaf87bf5db747ff3bfdfc395b..1c101e8f34e5cf1c80fbdc28214da6911e7789c0 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-30  Chris Dumez  <cdumez@apple.com>
>+
>+        Fix crashes when trying to ref the CallbackAggregator in NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=194054
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The callback aggregators should be ThreadSafeRefCounted since they are passed to other threads.
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::fetchWebsiteData):
>+        (WebKit::NetworkProcess::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersistentDataStores):
>+        (WebKit::NetworkProcess::topPrivatelyControlledDomainsWithWebsiteData):
>+
> 2019-01-29  Conrad Shultz  <conrad_shultz@apple.com>
> 
>         Ensure image picker sourceType is set before cameraDevice
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index ca57c4dbcd1d9d4990773814bc2306aff63105f4..0570953f27d75b071e8dc867c73afb39ea0e1709 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -1215,7 +1215,7 @@ static void fetchDiskCacheEntries(NetworkCache::Cache* cache, PAL::SessionID ses
> 
> void NetworkProcess::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, uint64_t callbackID)
> {
>-    struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
>+    struct CallbackAggregator final : public ThreadSafeRefCounted<CallbackAggregator> {
>         explicit CallbackAggregator(Function<void (WebsiteData)>&& completionHandler)
>             : m_completionHandler(WTFMove(completionHandler))
>         {
>@@ -1437,7 +1437,7 @@ void NetworkProcess::deleteWebsiteDataForTopPrivatelyControlledDomainsInAllPersi
> {
>     OptionSet<WebsiteDataFetchOption> fetchOptions = WebsiteDataFetchOption::DoNotCreateProcesses;
> 
>-    struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
>+    struct CallbackAggregator final : public ThreadSafeRefCounted<CallbackAggregator> {
>         explicit CallbackAggregator(CompletionHandler<void(const HashSet<String>&)>&& completionHandler)
>             : m_completionHandler(WTFMove(completionHandler))
>         {
>@@ -1569,7 +1569,7 @@ void NetworkProcess::topPrivatelyControlledDomainsWithWebsiteData(PAL::SessionID
> {
>     OptionSet<WebsiteDataFetchOption> fetchOptions = WebsiteDataFetchOption::DoNotCreateProcesses;
>     
>-    struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
>+    struct CallbackAggregator final : public ThreadSafeRefCounted<CallbackAggregator> {
>         explicit CallbackAggregator(CompletionHandler<void(HashSet<String>&&)>&& completionHandler)
>             : m_completionHandler(WTFMove(completionHandler))
>         {

Actions: View | Formatted Diff | Diff

Attachments on bug 194054: 360634