Attachment 343614 Details for Bug 186903 – Follow-up fix

[patch] Follow-up fix

bug-186903-20180626100617.patch (text/plain), 2.26 KB, created by Chris Dumez on 2018-06-26 10:06:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-06-26 10:06:18 PDT

Size: 2.26 KB

patch

obsolete

>Subversion Revision: 233201
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 45fa75123c57017c3a460f7ac6fd2979ae5a8c35..2ae4e6c62b442ab5f979693d88c0e5bdd94dea68 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-26  Chris Dumez  <cdumez@apple.com>
>+
>+        Resource Load Statistics: Make WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains() wait for the network process before calling its callback
>+        https://bugs.webkit.org/show_bug.cgi?id=186903
>+        <rdar://problem/41350182>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Follow-up fix after r233180 to address an API test crash. We need to keep the
>+        NetworkProcessProxy alive during the async updatePrevalentDomainsToPartitionOrBlockCookies
>+        request to make sure it completes.
>+
>+        * UIProcess/Network/NetworkProcessProxy.cpp:
>+        (WebKit::NetworkProcessProxy::updatePrevalentDomainsToPartitionOrBlockCookies):
>+
> 2018-06-26  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win] 'deref': is not a member of 'WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains::<lambda_9d761a6dc12d95db7fa2d6f3f5aa26fa>'
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>index 117a55100dcfad44f1c2622491fb0cdd324a4e0b..e1838cb6128c002162297dfefd954148281e16d2 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>@@ -445,7 +445,9 @@ void NetworkProcessProxy::updatePrevalentDomainsToPartitionOrBlockCookies(PAL::S
>     }
>     
>     auto callbackId = generateCallbackID();
>-    auto addResult = m_updatePartitionOrBlockCookiesCallbackMap.add(callbackId, WTFMove(callback));
>+    auto addResult = m_updatePartitionOrBlockCookiesCallbackMap.add(callbackId, [protectedThis = makeRef(*this), token = throttler().backgroundActivityToken(), callback = WTFMove(callback)] {
>+        callback();
>+    });
>     ASSERT_UNUSED(addResult, addResult.isNewEntry);
>     send(Messages::NetworkProcess::UpdatePrevalentDomainsToPartitionOrBlockCookies(sessionID, domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst == ShouldClearFirst::Yes, callbackId), 0);
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 186903: 343297 | 343370 | 343389 | 343520 | 343539 | 343550 | 343614