Changeset 287034 in webkit

Timestamp:

Dec 14, 2021, 11:23:07 AM (5 years ago)

Author:

Megan Gardner

Message:

Attachment does not update after markup.
​https://bugs.webkit.org/show_bug.cgi?id=234266

Reviewed by Wenson Hsieh.

If we don't call the deligate to inform Mail about the new attachment data,
it will not update and the original image will be sent.

• UIProcess/mac/WKSharingServicePickerDelegate.mm:

(-[WKSharingServicePickerDelegate sharingService:didShareItems:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKSharingServicePickerDelegate.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-14  Megan Gardner  <megan_gardner@apple.com>
+
+        Attachment does not update after markup.
+        https://bugs.webkit.org/show_bug.cgi?id=234266
+
+        Reviewed by Wenson Hsieh.
+
+        If we don't call the deligate to inform Mail about the new attachment data,
+        it will not update and the original image will be sent.
+
+        * UIProcess/mac/WKSharingServicePickerDelegate.mm:
+        (-[WKSharingServicePickerDelegate sharingService:didShareItems:]):
+
 2021-12-11  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.mm

@@ -149 +149 @@
         
         ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-        [itemProvider loadDataRepresentationForTypeIdentifier:(NSString *)kUTTypeData completionHandler:^(NSData *data, NSError *error) {
+        WeakPtr weakPage = _menuProxy->page();
+        [itemProvider loadDataRepresentationForTypeIdentifier:(NSString *)kUTTypeData completionHandler:[weakPage, attachmentID = _attachmentID](NSData *data, NSError *error) {
+            RefPtr webPage = weakPage.get();
+            
+            if (!webPage)
+                return;
+            
             if (error)
                 return;
             
-            auto apiAttachment = _menuProxy->page()->attachmentForIdentifier(_attachmentID);
+            auto apiAttachment = webPage->attachmentForIdentifier(attachmentID);
+            if (!apiAttachment)
+                return;
+            
             auto attachment = wrapper(apiAttachment);
             [attachment setData:data newContentType:String(NSPasteboardTypeTIFF)];
+            webPage->didInvalidateDataForAttachment(*apiAttachment.get());
         }];
         ALLOW_DEPRECATED_DECLARATIONS_END