Changeset 247103 in webkit

Timestamp:

Jul 3, 2019 2:01:50 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Use smarter pointers in WKDownloadProgress
​https://bugs.webkit.org/show_bug.cgi?id=199456
<rdar://problem/51392926>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-07-03
Reviewed by Chris Dumez.

There's still a problem related to our use of raw pointers. Let's just not use raw pointers.

• NetworkProcess/Downloads/Download.h:
• NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:

(WebKit::Download::publishProgress):

• NetworkProcess/Downloads/cocoa/WKDownloadProgress.h:
• NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm:

(-[WKDownloadProgress performCancel]):
(-[WKDownloadProgress initWithDownloadTask:download:URL:sandboxExtension:]):
(-[WKDownloadProgress progressCancelled]): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Downloads/Download.h (modified) (2 diffs)
• NetworkProcess/Downloads/cocoa/DownloadCocoa.mm (modified) (1 diff)
• NetworkProcess/Downloads/cocoa/WKDownloadProgress.h (modified) (1 diff)
• NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-03  Alex Christensen  <achristensen@webkit.org>
+
+        Use smarter pointers in WKDownloadProgress
+        https://bugs.webkit.org/show_bug.cgi?id=199456
+        <rdar://problem/51392926>
+
+        Reviewed by Chris Dumez.
+
+        There's still a problem related to our use of raw pointers.  Let's just not use raw pointers.
+
+        * NetworkProcess/Downloads/Download.h:
+        * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:
+        (WebKit::Download::publishProgress):
+        * NetworkProcess/Downloads/cocoa/WKDownloadProgress.h:
+        * NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm:
+        (-[WKDownloadProgress performCancel]):
+        (-[WKDownloadProgress initWithDownloadTask:download:URL:sandboxExtension:]):
+        (-[WKDownloadProgress progressCancelled]): Deleted.
+
 2019-07-03  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Downloads/Download.h

@@ -38 +38 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/RetainPtr.h>
+#include <wtf/WeakPtr.h>
 
 #if PLATFORM(COCOA)
@@ -65 +66 @@
 class WebPage;
 
-class Download : public IPC::MessageSender {
+class Download : public IPC::MessageSender, public CanMakeWeakPtr<Download> {
     WTF_MAKE_NONCOPYABLE(Download); WTF_MAKE_FAST_ALLOCATED;
 public:

trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm

@@ -112 +112 @@
         return;
 
-    m_progress = adoptNS([[WKDownloadProgress alloc] initWithDownloadTask:m_downloadTask.get() download:this URL:(NSURL *)url sandboxExtension:sandboxExtension]);
+    m_progress = adoptNS([[WKDownloadProgress alloc] initWithDownloadTask:m_downloadTask.get() download:*this URL:(NSURL *)url sandboxExtension:sandboxExtension]);
 #if USE(NSPROGRESS_PUBLISHING_SPI)
     [m_progress _publish];

trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.h

@@ -40 +40 @@
 @interface WKDownloadProgress : NSProgress
 
-- (instancetype)initWithDownloadTask:(NSURLSessionDownloadTask *)task download:(WebKit::Download*)download URL:(NSURL *)fileURL sandboxExtension:(RefPtr<WebKit::SandboxExtension>)sandboxExtension;
+- (instancetype)initWithDownloadTask:(NSURLSessionDownloadTask *)task download:(WebKit::Download&)download URL:(NSURL *)fileURL sandboxExtension:(RefPtr<WebKit::SandboxExtension>)sandboxExtension;
 
 @end

trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm

@@ -40 +40 @@
 @implementation WKDownloadProgress {
     RetainPtr<NSURLSessionDownloadTask> m_task;
-    WebKit::Download* m_download;
+    WeakPtr<WebKit::Download> m_download;
     RefPtr<WebKit::SandboxExtension> m_sandboxExtension;
-    std::once_flag m_progressCancelOnce;
 }
 
@@ -49 +48 @@
     if (m_download)
         m_download->cancel();
+    m_download = nullptr;
 }
 
-- (void)progressCancelled
-{
-    std::call_once(m_progressCancelOnce, [self] {
-        if (!isMainThread()) {
-            [self performSelectorOnMainThread:@selector(performCancel) withObject:nil waitUntilDone:NO];
-            return;
-        }
-
-        [self performCancel];
-    });
-}
-
-- (instancetype)initWithDownloadTask:(NSURLSessionDownloadTask *)task download:(WebKit::Download*)download URL:(NSURL *)fileURL sandboxExtension:(RefPtr<WebKit::SandboxExtension>)sandboxExtension
+- (instancetype)initWithDownloadTask:(NSURLSessionDownloadTask *)task download:(WebKit::Download&)download URL:(NSURL *)fileURL sandboxExtension:(RefPtr<WebKit::SandboxExtension>)sandboxExtension
 {
     if (!(self = [self initWithParent:nil userInfo:nil]))
@@ -69 +57 @@
 
     m_task = task;
-    m_download = download;
+    m_download = makeWeakPtr(download);
 
     [task addObserver:self forKeyPath:countOfBytesExpectedToReceiveKeyPath options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial context:WKDownloadProgressBytesExpectedToReceiveCountContext];
@@ -85 +73 @@
 
     self.cancellable = YES;
-    self.cancellationHandler = makeBlockPtr([weakSelf = WeakObjCPtr<WKDownloadProgress> { self }] {
-        [weakSelf.get() progressCancelled];
+    self.cancellationHandler = makeBlockPtr([weakSelf = WeakObjCPtr<WKDownloadProgress> { self }] () mutable {
+        if (!RunLoop::isMain()) {
+            RunLoop::main().dispatch([weakSelf = WTFMove(weakSelf)] {
+                [weakSelf performCancel];
+            });
+            return;
+        }
+        [weakSelf performCancel];
     }).get();