Changeset 231893 in webkit

Timestamp:

May 17, 2018 4:30:04 AM (6 years ago)

Author:

dino@apple.com

Message:

Safari optimized flow should be releasing viewer to prevent memory growth with subsequent launches/closes
​https://bugs.webkit.org/show_bug.cgi?id=185722
<rdar://problem/40247351>

Reviewed by Antoine Quint.

I made a rookie mistake in the original patch: I was holding a strong
reference to "self" in a block, which was causing a retain cycle.
Replace that with a WeakObjCPtr.

• UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:

(-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-17  Dean Jackson  <dino@apple.com>
+
+        Safari optimized flow should be releasing viewer to prevent memory growth with subsequent launches/closes
+        https://bugs.webkit.org/show_bug.cgi?id=185722
+        <rdar://problem/40247351>
+
+        Reviewed by Antoine Quint.
+
+        I made a rookie mistake in the original patch: I was holding a strong
+        reference to "self" in a block, which was causing a retain cycle.
+        Replace that with a WeakObjCPtr.
+
+        * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+        (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
+
 2018-05-16  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm

@@ -30 +30 @@
 
 #import "APIUIClient.h"
+#import "WeakObjCPtr.h"
 #import "WebPageProxy.h"
-
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <QuickLook/QuickLook.h>
@@ -88 +88 @@
     [_item setUseLoadingTimeout:NO];
 
-    [_itemProvider registerItemForTypeIdentifier:contentType loadHandler:^(NSItemProviderCompletionHandler completionHandler, Class expectedValueClass, NSDictionary * options) {
-        // This will get called once the download completes.
-        self.completionHandler = completionHandler;
+    WebKit::WeakObjCPtr<_WKPreviewControllerDataSource> weakSelf { self };
+    [_itemProvider registerItemForTypeIdentifier:contentType loadHandler:[weakSelf = WTFMove(weakSelf)] (NSItemProviderCompletionHandler completionHandler, Class expectedValueClass, NSDictionary * options) {
+        if (auto strongSelf = weakSelf.get())
+            [strongSelf setCompletionHandler:completionHandler];
     }];
     return _item.get();