Bug 234266 – Attachment does not update after markup.

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Megan Gardner]

Attachment does not update after markup.

[Megan Gardner]

Created attachment 447062 [details]
Patch

[Wenson Hsieh]

Comment on attachment 447062 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=447062&action=review

> Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.mm:158
> +            _menuProxy->page()->didInvalidateDataForAttachment(*apiAttachment.get());

Not new in this patch, but we should weakly capture WebPageProxy here (instead of accessing it through the raw pointer to _menuProxy.)

[Wenson Hsieh]

Comment on attachment 447062 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=447062&action=review

>> Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.mm:158
>> +            _menuProxy->page()->didInvalidateDataForAttachment(*apiAttachment.get());
> 
> Not new in this patch, but we should weakly capture WebPageProxy here (instead of accessing it through the raw pointer to _menuProxy.)

(Let's also add a null check for `apiAttachment`, since it's not guaranteed that the attachment ID will map to an actual API::Attachment here)

[Megan Gardner]

Created attachment 447068 [details]
Patch

[Wenson Hsieh]

Comment on attachment 447068 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=447068&action=review

> Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.mm:166
>          [itemProvider loadDataRepresentationForTypeIdentifier:(NSString *)kUTTypeData completionHandler:^(NSData *data, NSError *error) {
> +            WeakPtr webPage = _menuProxy->page();
> +            
> +            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());

You probably want something like this:

```
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 = webPage->attachmentForIdentifier(attachmentID);
    if (!apiAttachment)
        return;

    auto attachment = wrapper(apiAttachment);
    [attachment setData:data newContentType:String(NSPasteboardTypeTIFF)];
    webPage->didInvalidateDataForAttachment(*apiAttachment.get());
}];
```

[Megan Gardner]

Created attachment 447072 [details]
Patch

[Wenson Hsieh]

Comment on attachment 447072 [details]
Patch

r=mews

[EWS]

Committed r287034 (245234@main): <https://commits.webkit.org/245234@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 447072 [details].

[Radar WebKit Bug Importer]

<rdar://problem/86480352>