Attachment 362732 Details for Bug 194927 – Patch

[patch] Patch

bug-194927-20190222105041.patch (text/plain), 2.49 KB, created by Alex Christensen on 2019-02-22 10:50:42 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-02-22 10:50:42 PST

Size: 2.49 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 241925)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-02-22  Alex Christensen  <achristensen@webkit.org>
>+
>+        NetworkDataTask redirection should not keep alive its NetworkSession
>+        https://bugs.webkit.org/show_bug.cgi?id=194927
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This should fix rdar://problem/47580502
>+
>+        * NetworkProcess/NetworkDataTask.h:
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
>+        (WebKit::NetworkDataTaskCocoa::willPerformHTTPRedirection):
>+
> 2019-02-21  Tim Horton  <timothy_horton@apple.com>
> 
>         Turn a high-value UI-side-compositing assertion into a release assert
>Index: Source/WebKit/NetworkProcess/NetworkDataTask.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkDataTask.h	(revision 241903)
>+++ Source/WebKit/NetworkProcess/NetworkDataTask.h	(working copy)
>@@ -77,7 +77,7 @@ public:
>     virtual ~NetworkDataTaskClient() { }
> };
> 
>-class NetworkDataTask : public RefCounted<NetworkDataTask> {
>+class NetworkDataTask : public RefCounted<NetworkDataTask>, public CanMakeWeakPtr<NetworkDataTask> {
> public:
>     static Ref<NetworkDataTask> create(NetworkSession&, NetworkDataTaskClient&, const NetworkLoadParameters&);
> 
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	(revision 241903)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	(working copy)
>@@ -375,7 +375,9 @@ void NetworkDataTaskCocoa::willPerformHT
>     updateTaskWithFirstPartyForSameSiteCookies(m_task.get(), request);
> 
>     if (m_client)
>-        m_client->willPerformHTTPRedirection(WTFMove(redirectResponse), WTFMove(request), [completionHandler = WTFMove(completionHandler), this, protectedThis = makeRef(*this)] (auto&& request) mutable {
>+        m_client->willPerformHTTPRedirection(WTFMove(redirectResponse), WTFMove(request), [completionHandler = WTFMove(completionHandler), this, weakThis = makeWeakPtr(*this)] (auto&& request) mutable {
>+            if (!weakThis)
>+                return completionHandler({ });
>             if (!request.isNull()) {
> #if ENABLE(RESOURCE_LOAD_STATISTICS)
>                 bool shouldBlockCookies = m_session->networkStorageSession().shouldBlockCookies(request, m_frameID, m_pageID);

Flags:

darin: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 194927: 362680 | 362732 | 362763