Changeset 247185 in webkit

Timestamp:

Jul 5, 2019 4:34:49 PM (5 years ago)

Author:

dino@apple.com

Message:

[iOS] Context Menu - Add to Reading List does nothing
​https://bugs.webkit.org/show_bug.cgi?id=199504
<rdar://problem/52554137>

Reviewed by Anders Carlsson.

We were holding weak references to the _WKElementAction in
the handler provided to UIAction. By the time the handler was
called, the object had been deallocated.

• UIProcess/API/Cocoa/_WKElementAction.mm:

(-[_WKElementAction uiActionForElementInfo:]): Use strong references in handler.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-05  Dean Jackson  <dino@apple.com>
+
+        [iOS] Context Menu - Add to Reading List does nothing
+        https://bugs.webkit.org/show_bug.cgi?id=199504
+        <rdar://problem/52554137>
+
+        Reviewed by Anders Carlsson.
+
+        We were holding weak references to the _WKElementAction in
+        the handler provided to UIAction. By the time the handler was
+        called, the object had been deallocated.
+
+        * UIProcess/API/Cocoa/_WKElementAction.mm:
+        (-[_WKElementAction uiActionForElementInfo:]): Use strong references in handler.
+
 2019-07-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm

@@ -30 +30 @@
 
 #import "GestureTypes.h"
+#import "Logging.h"
 #import "WKActionSheetAssistant.h"
 #import "WKContentViewInteraction.h"
@@ -285 +286 @@
     UIActionIdentifier identifier = elementActionTypeToUIActionIdentifier(self.type);
 
-    return [UIAction actionWithTitle:self.title image:image identifier:identifier handler:[weakSelf = WeakObjCPtr<_WKElementAction>(self), weakElementInfo = WeakObjCPtr<_WKActivatedElementInfo>(elementInfo)] (UIAction *) {
-        auto strongSelf = weakSelf.get();
-        if (!strongSelf)
-            return;
-        auto strongElementInfo = weakElementInfo.get();
-        if (!strongElementInfo)
-            return;
-        [strongSelf runActionWithElementInfo:strongElementInfo.get()];
+    return [UIAction actionWithTitle:self.title image:image identifier:identifier handler:[retainedSelf = retainPtr(self), retainedInfo = retainPtr(elementInfo)] (UIAction *) {
+        auto elementAction = retainedSelf.get();
+        RELEASE_LOG(ContextMenu, "Executing action for type: %s", elementActionTypeToUIActionIdentifier([elementAction type]).UTF8String);
+        [elementAction runActionWithElementInfo:retainedInfo.get()];
     }];
 }